Vm-dev December 2014

vm-dev@lists.squeakfoundation.org

33 participants
160 discussions

VM Maker: VMMaker.oscog-cb.995.mcz
by commits＠source.squeak.org 19 Dec '14

19 Dec '14

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.995.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.995 Author: cb Time: 19 December 2014, 11:39:18.871 am UUID: 9e0e4367-220e-459a-807c-0878bfac2320 Ancestors: VMMaker.oscog-cb.994 Fixed a bug in inlined primitive sub (forgot to move to result register the result value). Now that I understood that ra means registerArgument and rr registerReceiver, rewrote trinaryInlinePrimitive to use correct names. =============== Diff against VMMaker.oscog-cb.994 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryConstOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryConstOpVarInlinePrimitive: prim "Const op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | ra val untaggedVal | (ra := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (ra := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. ra = ReceiverResultReg ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: ra. self ssPop: 1. val := self ssTop constant. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: ra]. [1] -> [self MoveCq: untaggedVal R: TempReg. + self SubR: ra R: TempReg. + self MoveR: TempReg R: ra ]. - self SubR: ra R: TempReg ]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: ra. objectRepresentation genAddSmallIntegerTagsTo: ra]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" [64] -> [self genConvertSmallIntegerToIntegerInReg: ra. self MoveCq: val R: TempReg. self MoveXwr: ra R: TempReg R: ra ]. [65] -> [self genConvertSmallIntegerToIntegerInReg: ra. self MoveCq: val R: TempReg. self MoveXbr: ra R: TempReg R: ra ] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: ra. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genTrinaryInlinePrimitive: (in category 'inline primitive generators') ----- genTrinaryInlinePrimitive: prim "Unary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#trinaryInlinePrimitive:" | ra rr | (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rr := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. (ra := backEnd availableRegisterOrNilFor: (self liveRegisters bitOr: (self registerMaskFor: rr))) ifNil: [self ssAllocateRequiredReg: (ra := Arg1Reg)]. (rr = ReceiverResultReg or: [ra = ReceiverResultReg]) ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: TempReg. self ssPop: 1. - self ssTop popToReg: rr. - self ssPop: 1. self ssTop popToReg: ra. self ssPop: 1. + self ssTop popToReg: rr. + self ssPop: 1. self ssPushRegister: TempReg. + self genConvertSmallIntegerToIntegerInReg: ra. - self genConvertSmallIntegerToIntegerInReg: rr. "Now: ra is the variable object, rr is long, TempReg holds the value to store." prim caseOf: { "0 - 1 pointerAt:put: and byteAt:Put:" + [0] -> [ self MoveR: TempReg Xwr: ra R: rr ]. - [0] -> [ self MoveR: TempReg Xwr: rr R: ra ]. [1] -> [ self genConvertSmallIntegerToIntegerInReg: TempReg. + self MoveR: TempReg Xbr: ra R: rr ] - self MoveR: TempReg Xbr: rr R: ra ] } otherwise: [^EncounteredUnknownBytecode]. - ^0!

1 0

VM Maker: VMMaker.oscog-cb.994.mcz
by commits＠source.squeak.org 19 Dec '14

19 Dec '14

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.994.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.994 Author: cb Time: 19 December 2014, 11:31:13.63 am UUID: 09c70d1c-d75e-4095-9205-dec6b5080db6 Ancestors: VMMaker.oscog-cb.993 Fixed bugs in inlined primitive (I mixed some registers). Fixed bug with inlined primitive sub for cst - reg (inlined primitive code was doing reg - cst) =============== Diff against VMMaker.oscog-cb.993 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryConstOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryConstOpVarInlinePrimitive: prim "Const op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | ra val untaggedVal | (ra := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (ra := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. ra = ReceiverResultReg ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: ra. self ssPop: 1. val := self ssTop constant. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: ra]. + [1] -> [self MoveCq: untaggedVal R: TempReg. + self SubR: ra R: TempReg ]. - [1] -> [self SubCq: untaggedVal R: ra]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: ra. objectRepresentation genAddSmallIntegerTagsTo: ra]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" + [64] -> [self genConvertSmallIntegerToIntegerInReg: ra. + self MoveCq: val R: TempReg. + self MoveXwr: ra R: TempReg R: ra ]. + [65] -> [self genConvertSmallIntegerToIntegerInReg: ra. + self MoveCq: val R: TempReg. + self MoveXbr: ra R: TempReg R: ra ] - [64] -> [untaggedVal := untaggedVal >> 1. - self MoveXwr: untaggedVal R: ra R: ra ]. - [65] -> [untaggedVal := untaggedVal >> 1. - self MoveXbr: untaggedVal R: ra R: ra ] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: ra. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpConstInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpConstInlinePrimitive: prim "Var op const version of inline binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | rr val untaggedVal | (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rr := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. rr = ReceiverResultReg ifTrue: [optStatus isReceiverResultRegLive: false]. val := self ssTop constant. self ssPop: 1. self ssTop popToReg: rr. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: rr]. + [1] -> [self SubCq: untaggedVal R: rr ]. - [1] -> [self SubCq: untaggedVal R: rr]. [2] -> [self flag: 'could use MulCq:R'. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: rr. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" [64] -> [self genConvertSmallIntegerToIntegerInReg: rr. + self MoveCq: val >> 1 R: TempReg. + self MoveXwr: TempReg R: rr R: rr ]. - self MoveXwr: rr R: val R: rr ]. [65] -> [self genConvertSmallIntegerToIntegerInReg: rr. + self MoveCq: val >> 1 R: TempReg. + self MoveXbr: TempReg R: rr R: rr ] - self MoveXbr: rr R: val R: rr ] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpVarInlinePrimitive: prim "Var op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | ra rr | (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rr := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. (ra := backEnd availableRegisterOrNilFor: (self liveRegisters bitOr: (self registerMaskFor: rr))) ifNil: [self ssAllocateRequiredReg: (ra := Arg1Reg)]. (rr = ReceiverResultReg or: [ra = ReceiverResultReg]) ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: ra. self ssPop: 1. self ssTop popToReg: rr. self ssPop: 1. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self AddR: ra R: rr]. [1] -> [self SubR: ra R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: rr. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ra. self MulR: ra R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" + [64] -> [self genConvertSmallIntegerToIntegerInReg: ra. + self MoveXwr: ra R: rr R: rr ]. + [65] -> [self genConvertSmallIntegerToIntegerInReg: ra. + self MoveXbr: ra R: rr R: rr ] - [64] -> [self genConvertSmallIntegerToIntegerInReg: rr. - self MoveXwr: rr R: ra R: ra ]. - [65] -> [self genConvertSmallIntegerToIntegerInReg: rr. - self MoveXbr: rr R: ra R: ra ] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0!

1 0

VM Maker: VMMaker.oscog-cb.993.mcz
by commits＠source.squeak.org 19 Dec '14

19 Dec '14

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.993.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.993 Author: cb Time: 19 December 2014, 10:43:29.176 am UUID: 94e6546c-43c8-4f3a-a18e-175e5dacd79e Ancestors: VMMaker.oscog-eem.992 Added inlined primitive code for: byteNumByte pointerAt: byteAt: pointerAt:put: byteAt:put: Variable object inlined primitives are amazingly little because the optimizer ensures the rcvr and args types and range (including second arg range for byteAt:put:) and handles at bytecode level the instSize shifts. Generated assembly code looks ok but I didn't run it. Can you review #genGetNumBytesOf:into: Eliot ? I am not sure how to rewrite that in a single instruction: cogit AndCq: objectMemory formatMask R: destReg. cogit AndCq: objectMemory wordSize - 1 R: destReg. I will now try to add code for inlined primitive < <= = ~= =============== Diff against VMMaker.oscog-eem.992 =============== Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>genGetNumBytesOf:into: (in category 'compile abstract instructions') ----- + genGetNumBytesOf: srcReg into: destReg + "Get the size in byte-sized slots of the object in srcReg into destReg. + srcReg may equal destReg. + destReg <- numSlots << self shiftForWord - (fmt bitAnd: 7)." + <var: #jmp type: #'AbstractInstruction'> + | jmp | + self genGetRawSlotSizeOfNonImm: srcReg into: TempReg. + cogit CmpCq: objectMemory numSlotsMask R: TempReg. + jmp := cogit JumpLess: 0. + cogit MoveMw: objectMemory wordSize negated r: srcReg R: TempReg. + jmp jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: TempReg). + "Now: TempReg = numSlots << shiftForWord" + cogit MoveMw: 0 r: srcReg R: destReg. + cogit LogicalShiftRightCq: objectMemory formatShift R: destReg. + cogit AndCq: objectMemory formatMask R: destReg. + cogit AndCq: objectMemory wordSize - 1 R: destReg. + "Now: fmt bitAnd: 7 in destReg" + cogit SubR: TempReg R: destReg. + ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryConstOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryConstOpVarInlinePrimitive: prim "Const op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | ra val untaggedVal | (ra := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (ra := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. ra = ReceiverResultReg ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: ra. self ssPop: 1. val := self ssTop constant. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: ra]. [1] -> [self SubCq: untaggedVal R: ra]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: ra. objectRepresentation genAddSmallIntegerTagsTo: ra]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" + [64] -> [untaggedVal := untaggedVal >> 1. + self MoveXwr: untaggedVal R: ra R: ra ]. + [65] -> [untaggedVal := untaggedVal >> 1. + self MoveXbr: untaggedVal R: ra R: ra ] - } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: ra. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpConstInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpConstInlinePrimitive: prim "Var op const version of inline binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | rr val untaggedVal | (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rr := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. rr = ReceiverResultReg ifTrue: [optStatus isReceiverResultRegLive: false]. val := self ssTop constant. self ssPop: 1. self ssTop popToReg: rr. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: rr]. [1] -> [self SubCq: untaggedVal R: rr]. [2] -> [self flag: 'could use MulCq:R'. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: rr. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" + [64] -> [self genConvertSmallIntegerToIntegerInReg: rr. + self MoveXwr: rr R: val R: rr ]. + [65] -> [self genConvertSmallIntegerToIntegerInReg: rr. + self MoveXbr: rr R: val R: rr ] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpVarInlinePrimitive: prim "Var op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | ra rr | (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rr := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. (ra := backEnd availableRegisterOrNilFor: (self liveRegisters bitOr: (self registerMaskFor: rr))) ifNil: [self ssAllocateRequiredReg: (ra := Arg1Reg)]. (rr = ReceiverResultReg or: [ra = ReceiverResultReg]) ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: ra. self ssPop: 1. self ssTop popToReg: rr. self ssPop: 1. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self AddR: ra R: rr]. [1] -> [self SubR: ra R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: rr. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ra. self MulR: ra R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" + [64] -> [self genConvertSmallIntegerToIntegerInReg: rr. + self MoveXwr: rr R: ra R: ra ]. + [65] -> [self genConvertSmallIntegerToIntegerInReg: rr. + self MoveXbr: rr R: ra R: ra ] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genTrinaryInlinePrimitive: (in category 'inline primitive generators') ----- genTrinaryInlinePrimitive: prim "Unary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#trinaryInlinePrimitive:" + + | ra rr | + (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: + [self ssAllocateRequiredReg: + (rr := optStatus isReceiverResultRegLive + ifTrue: [Arg0Reg] + ifFalse: [ReceiverResultReg])]. + (ra := backEnd availableRegisterOrNilFor: (self liveRegisters bitOr: (self registerMaskFor: rr))) ifNil: + [self ssAllocateRequiredReg: (ra := Arg1Reg)]. + (rr = ReceiverResultReg or: [ra = ReceiverResultReg]) ifTrue: + [optStatus isReceiverResultRegLive: false]. + self ssTop popToReg: TempReg. + self ssPop: 1. + self ssTop popToReg: rr. + self ssPop: 1. + self ssTop popToReg: ra. + self ssPop: 1. + self ssPushRegister: TempReg. + self genConvertSmallIntegerToIntegerInReg: rr. + "Now: ra is the variable object, rr is long, TempReg holds the value to store." + prim caseOf: { + "0 - 1 pointerAt:put: and byteAt:Put:" + [0] -> [ self MoveR: TempReg Xwr: rr R: ra ]. + [1] -> [ self genConvertSmallIntegerToIntegerInReg: TempReg. + self MoveR: TempReg Xbr: rr R: ra ] + } + otherwise: [^EncounteredUnknownBytecode]. + + ^0! - "not yet implemented" - ^EncounteredUnknownBytecode! Item was changed: ----- Method: StackToRegisterMappingCogit>>genUnaryInlinePrimitive: (in category 'inline primitive generators') ----- genUnaryInlinePrimitive: prim "Unary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#unaryInlinePrimitive:" | rcvrReg resultReg | self ssTop type = SSRegister ifTrue: [rcvrReg := self ssTop register] ifFalse: [(rcvrReg := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rcvrReg := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]]. self ssTop popToReg: rcvrReg. self ssPop: 1. (resultReg := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssFlushUpThroughRegister: rcvrReg]. prim caseOf: { [1] -> "01 unchecked pointer numSlots" [resultReg ifNil: [resultReg := rcvrReg]. objectRepresentation genGetNumSlotsOf: rcvrReg into: resultReg; genConvertIntegerToSmallIntegerInScratchReg: resultReg. self ssPushRegister: resultReg]. + [3] -> "03 unchecked byte numBytes" + [resultReg ifNil: [resultReg := rcvrReg]. + objectRepresentation + genGetNumBytesOf: rcvrReg into: resultReg; + genConvertIntegerToSmallIntegerInScratchReg: resultReg. + self ssPushRegister: resultReg]. } otherwise: [^EncounteredUnknownBytecode]. ^0!

1 0

[commit][3193] Fix slip in thrlogidx declaration ( affects only multithreaded VMs).
by commits＠squeakvm.org 19 Dec '14

19 Dec '14

Revision: 3193 Author: eliot Date: 2014-12-18 15:10:40 -0800 (Thu, 18 Dec 2014) Log Message: ----------- Fix slip in thrlogidx declaration (affects only multithreaded VMs). Modified Paths: -------------- branches/Cog/platforms/Cross/vm/sq.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/platforms/Cross/vm/sq.h =================================================================== --- branches/Cog/platforms/Cross/vm/sq.h 2014-12-18 22:22:19 UTC (rev 3192) +++ branches/Cog/platforms/Cross/vm/sq.h 2014-12-18 23:10:40 UTC (rev 3193) @@ -269,7 +269,7 @@ #if COGMTVM #define THRLOGSZ 256 -extern int thrlogidx = 0; +extern int thrlogidx; extern char *thrlog[]; /* Debug logging that defers printing. Use like printf, e.g. Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Dec 18 14:21:16 PST 2014 + Thu Dec 18 15:10:34 PST 2014

1 0

[commit][3192] CogVM source as per VMMaker.oscog-eem.992
by commits＠squeakvm.org 18 Dec '14

18 Dec '14

Revision: 3192 Author: eliot Date: 2014-12-18 14:22:19 -0800 (Thu, 18 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.992 64-bit Spur: Correct a few comparisons and shifts in small float code to make comparisons in generated C correct. Move loadFloatOrInt: into the ObjectMemory hierarchies to allow Spur64BitMemoryManager to generate better code. Make printOopShortInner: small-float savvy. Make printHexnp: 64-bit aware. Can now interact with a 64-bit Spur image. Unix: Fix missed signature change in sqUnixFBDev.c. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/unix/vm-display-fbdev/sqUnixFBDev.c branches/Cog/scripts/mkspurvmarchives branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-12-17 22:59:41 UTC (rev 3191) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-12-18 22:22:19 UTC (rev 3192) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 from - CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2099,7 +2099,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.991"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.992"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -7963,7 +7963,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -8023,7 +8023,7 @@ null; goto l108; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10917,7 +10917,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -10977,7 +10977,7 @@ null; goto l243; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -19013,7 +19013,7 @@ putchar(' '); if (p > 1024) { /* begin printHexnp: */ - printf("0x%x", p); + printf("0x%lx", p); } else { printNum(p); @@ -24525,7 +24525,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -24572,7 +24572,7 @@ } return; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -47257,13 +47257,13 @@ print(" ("); /* begin printHexnp: */ - printf("0x%x", class); + printf("0x%lx", class); print(")"); } fmt = (((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15; print(" format "); /* begin printHexnp: */ - printf("0x%x", fmt); + printf("0x%lx", fmt); if (fmt > 4) { print(" nbytes "); printNum(numBytesOf(oop)); @@ -47315,7 +47315,7 @@ } print(" hash "); /* begin printHexnp: */ - printf("0x%x", (((usqInt) (longAt(oop))) >> HashBitsOffset) & HashMaskUnshifted); + printf("0x%lx", (((usqInt) (longAt(oop))) >> HashBitsOffset) & HashMaskUnshifted); /* begin cr */ printf("\n"); if (((fmt >= 8) && (fmt <= (12 - 1)))) { @@ -49670,7 +49670,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(page)); + printf("0x%lx", oopForPointer(page)); /* begin cr */ printf("\n"); printFramesInPage(page); @@ -49790,6 +49790,7 @@ sqInt header; sqInt i; sqInt methodClassAssociation; + sqInt n; char *name; sqInt nameLen; sqInt obj; @@ -49815,7 +49816,7 @@ offset = (literalCountOfMethodHeader(methodHeaderOf(oop))) - 1; methodClassAssociation = longAt((oop + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%x", oop); + printf("0x%lx", oop); /* begin space */ /* begin printChar: */ putchar(' '); @@ -49827,14 +49828,23 @@ : methodClassAssociation); if ((oop2 & 1)) { ; - printNum((oop2 >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop2 >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop2 & 1)) { + printNum((oop2 >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop2 >> 1)); + /* begin printChar: */ + putchar(')'); - goto l5; + goto l8; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop2); + + goto l8; } if (!(((oop2 & 3) == 0) && (((((usqInt)oop2)) >= (startOfMemory())) @@ -49843,16 +49853,16 @@ print(((oop2 & (BytesPerWord - 1)) != 0 ? " is misaligned" : whereIs(oop2))); - goto l5; + goto l8; } if (((longAt(oop2)) & TypeMask) == HeaderTypeFree) { print(" is a free chunk"); - goto l5; + goto l8; } if (isinstanceOfcompactClassIndex(oop2, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord()))), ClassFloatCompactIndex)) { printFloat(dbgFloatValueOf(oop2)); - goto l5; + goto l8; } classOop = (((ccIndex = (((usqInt) (longAt(oop2))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(oop2 - BaseHeaderSize)) & AllButTypeMask @@ -49863,28 +49873,28 @@ && (((((usqInt)classOop)) < GIV(freeStart)) && (((longAt(classOop)) & TypeMask) != HeaderTypeGC))))) { print("a ??"); - goto l5; + goto l8; } if ((numSlotsOf(classOop)) == GIV(metaclassNumSlots)) { printNameOfClasscount(oop2, 5); - goto l5; + goto l8; } if (oop2 == GIV(nilObj)) { print("nil"); - goto l5; + goto l8; } if (oop2 == GIV(trueObj)) { print("true"); - goto l5; + goto l8; } if (oop2 == GIV(falseObj)) { print("false"); - goto l5; + goto l8; } nameLen = lengthOfNameOfClass(classOop); if (nameLen == 0) { print("a ??"); - goto l5; + goto l8; } name = nameOfClass(classOop); if (nameLen == 10) { @@ -49898,7 +49908,7 @@ /* begin printChar: */ putchar('\''); - goto l5; + goto l8; } if ((strncmp(name, "ByteSymbol", 10)) == 0) { @@ -49907,7 +49917,7 @@ /* begin printChar: */ putchar('#'); printStringOf(oop2); - goto l5; + goto l8; } } if ((nameLen == 9) @@ -49917,7 +49927,7 @@ /* begin printChar: */ putchar(((longAt((oop2 + BaseHeaderSize) + (0 << (shiftForWord())))) >> 1)); - goto l5; + goto l8; } print("a(n) "); for (i = 0; i < nameLen; i += 1) { @@ -49935,33 +49945,34 @@ longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex1 - 1) << (shiftForWord()))))); while (1) { if (classLookupKey == GIV(nilObj)) { - goto l5; + goto l8; } if ((instanceSizeOf(classLookupKey)) == (KeyIndex + 1)) break; classLookupKey = longAt((classLookupKey + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); } if (classLookupKey == GIV(nilObj)) { - goto l8; + goto l5; } theClass1 = classOop; while (1) { if (theClass1 == classLookupKey) { - goto l7; + goto l6; } if (!(theClass1 != GIV(nilObj))) break; theClass1 = longAt((theClass1 + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); } - goto l8; - l7: ; + goto l5; + l6: ; /* begin space */ /* begin printChar: */ putchar(' '); printOopShort(longAt((oop2 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); - l8: ; + /* begin printHexnp: */ + printf("0x%lx", longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + l5: ; } - l5: /* end printOopShortInner: */; + l8: /* end printOopShortInner: */; /* begin cr */ printf("\n"); } @@ -50111,6 +50122,7 @@ sqInt classLookupKey; sqInt classOop; sqInt i; + sqInt n; char *name; sqInt nameLen; sqInt oop1; @@ -50119,13 +50131,22 @@ /* begin printOopShortInner: */ if ((oop & 1)) { ; - printNum((oop >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop & 1)) { + printNum((oop >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop >> 1)); + /* begin printChar: */ + putchar(')'); + goto l4; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop); + goto l4; } if (!(((oop & 3) == 0) @@ -50250,7 +50271,8 @@ putchar(' '); printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + /* begin printHexnp: */ + printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); l1: ; } l4: /* end printOopShortInner: */; @@ -51541,7 +51563,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(page)); + printf("0x%lx", oopForPointer(page)); /* begin cr */ printf("\n"); shortPrintFramesInPage(page); @@ -51568,7 +51590,7 @@ sqInt ccIndex; /* begin printHexnp: */ - printf("0x%x", oop); + printf("0x%lx", oop); if ((oop & 1)) { if ((oop & 1)) { printf("=%ld\n", (long)integerValueOf(oop)); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-12-17 22:59:41 UTC (rev 3191) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-12-18 22:22:19 UTC (rev 3192) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-17 22:59:41 UTC (rev 3191) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-18 22:22:19 UTC (rev 3192) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 from - CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2102,7 +2102,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.991"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.992"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -7972,7 +7972,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -8032,7 +8032,7 @@ null; goto l108; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10926,7 +10926,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -10986,7 +10986,7 @@ null; goto l243; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -19022,7 +19022,7 @@ putchar(' '); if (p > 1024) { /* begin printHexnp: */ - printf("0x%x", p); + printf("0x%lx", p); } else { printNum(p); @@ -24534,7 +24534,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -24581,7 +24581,7 @@ } return; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -47266,13 +47266,13 @@ print(" ("); /* begin printHexnp: */ - printf("0x%x", class); + printf("0x%lx", class); print(")"); } fmt = (((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15; print(" format "); /* begin printHexnp: */ - printf("0x%x", fmt); + printf("0x%lx", fmt); if (fmt > 4) { print(" nbytes "); printNum(numBytesOf(oop)); @@ -47324,7 +47324,7 @@ } print(" hash "); /* begin printHexnp: */ - printf("0x%x", (((usqInt) (longAt(oop))) >> HashBitsOffset) & HashMaskUnshifted); + printf("0x%lx", (((usqInt) (longAt(oop))) >> HashBitsOffset) & HashMaskUnshifted); /* begin cr */ printf("\n"); if (((fmt >= 8) && (fmt <= (12 - 1)))) { @@ -49679,7 +49679,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(page)); + printf("0x%lx", oopForPointer(page)); /* begin cr */ printf("\n"); printFramesInPage(page); @@ -49799,6 +49799,7 @@ sqInt header; sqInt i; sqInt methodClassAssociation; + sqInt n; char *name; sqInt nameLen; sqInt obj; @@ -49824,7 +49825,7 @@ offset = (literalCountOfMethodHeader(methodHeaderOf(oop))) - 1; methodClassAssociation = longAt((oop + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%x", oop); + printf("0x%lx", oop); /* begin space */ /* begin printChar: */ putchar(' '); @@ -49836,14 +49837,23 @@ : methodClassAssociation); if ((oop2 & 1)) { ; - printNum((oop2 >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop2 >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop2 & 1)) { + printNum((oop2 >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop2 >> 1)); + /* begin printChar: */ + putchar(')'); - goto l5; + goto l8; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop2); + + goto l8; } if (!(((oop2 & 3) == 0) && (((((usqInt)oop2)) >= (startOfMemory())) @@ -49852,16 +49862,16 @@ print(((oop2 & (BytesPerWord - 1)) != 0 ? " is misaligned" : whereIs(oop2))); - goto l5; + goto l8; } if (((longAt(oop2)) & TypeMask) == HeaderTypeFree) { print(" is a free chunk"); - goto l5; + goto l8; } if (isinstanceOfcompactClassIndex(oop2, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord()))), ClassFloatCompactIndex)) { printFloat(dbgFloatValueOf(oop2)); - goto l5; + goto l8; } classOop = (((ccIndex = (((usqInt) (longAt(oop2))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(oop2 - BaseHeaderSize)) & AllButTypeMask @@ -49872,28 +49882,28 @@ && (((((usqInt)classOop)) < GIV(freeStart)) && (((longAt(classOop)) & TypeMask) != HeaderTypeGC))))) { print("a ??"); - goto l5; + goto l8; } if ((numSlotsOf(classOop)) == GIV(metaclassNumSlots)) { printNameOfClasscount(oop2, 5); - goto l5; + goto l8; } if (oop2 == GIV(nilObj)) { print("nil"); - goto l5; + goto l8; } if (oop2 == GIV(trueObj)) { print("true"); - goto l5; + goto l8; } if (oop2 == GIV(falseObj)) { print("false"); - goto l5; + goto l8; } nameLen = lengthOfNameOfClass(classOop); if (nameLen == 0) { print("a ??"); - goto l5; + goto l8; } name = nameOfClass(classOop); if (nameLen == 10) { @@ -49907,7 +49917,7 @@ /* begin printChar: */ putchar('\''); - goto l5; + goto l8; } if ((strncmp(name, "ByteSymbol", 10)) == 0) { @@ -49916,7 +49926,7 @@ /* begin printChar: */ putchar('#'); printStringOf(oop2); - goto l5; + goto l8; } } if ((nameLen == 9) @@ -49926,7 +49936,7 @@ /* begin printChar: */ putchar(((longAt((oop2 + BaseHeaderSize) + (0 << (shiftForWord())))) >> 1)); - goto l5; + goto l8; } print("a(n) "); for (i = 0; i < nameLen; i += 1) { @@ -49944,33 +49954,34 @@ longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex1 - 1) << (shiftForWord()))))); while (1) { if (classLookupKey == GIV(nilObj)) { - goto l5; + goto l8; } if ((instanceSizeOf(classLookupKey)) == (KeyIndex + 1)) break; classLookupKey = longAt((classLookupKey + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); } if (classLookupKey == GIV(nilObj)) { - goto l8; + goto l5; } theClass1 = classOop; while (1) { if (theClass1 == classLookupKey) { - goto l7; + goto l6; } if (!(theClass1 != GIV(nilObj))) break; theClass1 = longAt((theClass1 + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); } - goto l8; - l7: ; + goto l5; + l6: ; /* begin space */ /* begin printChar: */ putchar(' '); printOopShort(longAt((oop2 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); - l8: ; + /* begin printHexnp: */ + printf("0x%lx", longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + l5: ; } - l5: /* end printOopShortInner: */; + l8: /* end printOopShortInner: */; /* begin cr */ printf("\n"); } @@ -50120,6 +50131,7 @@ sqInt classLookupKey; sqInt classOop; sqInt i; + sqInt n; char *name; sqInt nameLen; sqInt oop1; @@ -50128,13 +50140,22 @@ /* begin printOopShortInner: */ if ((oop & 1)) { ; - printNum((oop >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop & 1)) { + printNum((oop >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop >> 1)); + /* begin printChar: */ + putchar(')'); + goto l4; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop); + goto l4; } if (!(((oop & 3) == 0) @@ -50259,7 +50280,8 @@ putchar(' '); printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + /* begin printHexnp: */ + printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); l1: ; } l4: /* end printOopShortInner: */; @@ -51550,7 +51572,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(page)); + printf("0x%lx", oopForPointer(page)); /* begin cr */ printf("\n"); shortPrintFramesInPage(page); @@ -51577,7 +51599,7 @@ sqInt ccIndex; /* begin printHexnp: */ - printf("0x%x", oop); + printf("0x%lx", oop); if ((oop & 1)) { if ((oop & 1)) { printf("=%ld\n", (long)integerValueOf(oop)); Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-12-17 22:59:41 UTC (rev 3191) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-12-18 22:22:19 UTC (rev 3192) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 from - CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2350,7 +2350,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.991"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.992"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -23341,7 +23341,7 @@ putchar(' '); if (p > 1024) { /* begin printHexnp: */ - printf("0x%x", p); + printf("0x%lx", p); } else { printNum(p); @@ -59233,27 +59233,27 @@ print("freeChunk "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(freeChunk)); + printf("0x%lx", oopForPointer(freeChunk)); print(" bytes "); printNum(numBytes); print(" next "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))); if ((numBytes >= (32 * 8)) && (!isNextChunk)) { print(" ^ "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))); print(" < "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))); print(" > "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (4 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (4 << (shiftForWord()))))); } /* begin cr */ printf("\n"); @@ -59284,10 +59284,10 @@ printf("\n"); print("mask: "); /* begin printHexnp: */ - printf("0x%x", GIV(freeListsMask)); + printf("0x%lx", GIV(freeListsMask)); print(" expected: "); /* begin printHexnp: */ - printf("0x%x", expectedMask); + printf("0x%lx", expectedMask); /* begin cr */ printf("\n"); } @@ -66819,17 +66819,17 @@ printNameOfClasscount(class, 5); print(" ("); /* begin printHexnp: */ - printf("0x%x", (longAt(oop)) & 0x3FFFFF); + printf("0x%lx", (longAt(oop)) & 0x3FFFFF); print("=>"); /* begin printHexnp: */ - printf("0x%x", class); + printf("0x%lx", class); print(")"); } fmt = (((usqInt) (longAt(oop))) >> 24) & 0x1F; print(" format "); /* begin printHexnp: */ - printf("0x%x", fmt); + printf("0x%lx", fmt); if (fmt > 5) { print(" nbytes "); printNum(numBytesOf(oop)); @@ -66896,7 +66896,7 @@ putchar(aByte4); print(" hash "); /* begin printHexnp: */ - printf("0x%x", (long32At(oop + 4)) & 0x3FFFFF); + printf("0x%lx", (long32At(oop + 4)) & 0x3FFFFF); /* begin cr */ printf("\n"); if (((fmt >= 16) && (fmt <= (24 - 1)))) { @@ -69438,7 +69438,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(page)); + printf("0x%lx", oopForPointer(page)); /* begin cr */ printf("\n"); printFramesInPage(page); @@ -69574,6 +69574,9 @@ sqInt i2; sqInt limit; sqInt methodClassAssociation; + sqInt n; + sqInt n1; + sqInt n2; char *name; char *name1; char *name2; @@ -69604,6 +69607,9 @@ sqInt prevObj1; sqInt prevPrevObj; sqInt prevPrevObj1; + sqInt referent; + sqInt referent1; + sqInt referent2; sqInt theClass1; sqInt theClass11; sqInt theClass12; @@ -69635,7 +69641,7 @@ offset = (literalCountOf(objOop1)) - 1; methodClassAssociation = longAt((objOop1 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%x", objOop1); + printf("0x%lx", objOop1); /* begin space */ /* begin printChar: */ putchar(' '); @@ -69653,19 +69659,29 @@ putchar(((usqInt) (((usqInt)oop))) >> 2); /* begin printChar: */ putchar('('); - printHex((oop >> 1)); + /* begin printHexnp: */ + printf("0x%lx", (oop >> 1)); /* begin printChar: */ putchar(')'); goto l27; } - printNum((oop >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop & 1)) { + printNum((oop >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop >> 1)); + /* begin printChar: */ + putchar(')'); + goto l27; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop); + goto l27; } if (!(addressCouldBeObj(oop))) { @@ -69680,7 +69696,16 @@ } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { print(" is a forwarder to "); - printHex(followForwarded(oop)); + /* begin printHexnp: */ + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(oop)); + referent = longAt((oop + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); + } + n = referent; + printf("0x%lx", n); goto l27; } @@ -69841,7 +69866,8 @@ putchar(' '); printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + /* begin printHexnp: */ + printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); l22: ; } l27: /* end printOopShortInner: */; @@ -69871,7 +69897,7 @@ offset = (literalCountOf(objOop1)) - 1; methodClassAssociation = longAt((objOop1 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%x", objOop1); + printf("0x%lx", objOop1); /* begin space */ /* begin printChar: */ putchar(' '); @@ -69889,19 +69915,29 @@ putchar(((usqInt) (((usqInt)oop1))) >> 2); /* begin printChar: */ putchar('('); - printHex((oop1 >> 1)); + /* begin printHexnp: */ + printf("0x%lx", (oop1 >> 1)); /* begin printChar: */ putchar(')'); goto l35; } - printNum((oop1 >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop1 >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop1 & 1)) { + printNum((oop1 >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop1 >> 1)); + /* begin printChar: */ + putchar(')'); + goto l35; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop1); + goto l35; } if (!(addressCouldBeObj(oop1))) { @@ -69916,7 +69952,16 @@ } if (((longAt(oop1)) & (0x3FFFFF - 8)) == 0) { print(" is a forwarder to "); - printHex(followForwarded(oop1)); + /* begin printHexnp: */ + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(oop1)); + referent1 = longAt((oop1 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent1 & 3) == 0) + && (((longAt(referent1)) & 0x3FFFFF) == 8)) { + referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + n1 = referent1; + printf("0x%lx", n1); goto l35; } @@ -70077,7 +70122,8 @@ putchar(' '); printOopShort(longAt((oop1 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop1 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + /* begin printHexnp: */ + printf("0x%lx", longAt((oop1 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); l34: ; } l35: /* end printOopShortInner: */; @@ -70112,7 +70158,7 @@ offset = (literalCountOf(objOop11)) - 1; methodClassAssociation = longAt((objOop11 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%x", objOop11); + printf("0x%lx", objOop11); /* begin space */ /* begin printChar: */ putchar(' '); @@ -70130,19 +70176,29 @@ putchar(((usqInt) (((usqInt)oop2))) >> 2); /* begin printChar: */ putchar('('); - printHex((oop2 >> 1)); + /* begin printHexnp: */ + printf("0x%lx", (oop2 >> 1)); /* begin printChar: */ putchar(')'); goto l42; } - printNum((oop2 >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop2 >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop2 & 1)) { + printNum((oop2 >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop2 >> 1)); + /* begin printChar: */ + putchar(')'); + goto l42; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop2); + goto l42; } if (!(addressCouldBeObj(oop2))) { @@ -70157,7 +70213,16 @@ } if (((longAt(oop2)) & (0x3FFFFF - 8)) == 0) { print(" is a forwarder to "); - printHex(followForwarded(oop2)); + /* begin printHexnp: */ + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(oop2)); + referent2 = longAt((oop2 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent2 & 3) == 0) + && (((longAt(referent2)) & 0x3FFFFF) == 8)) { + referent2 = longAt((referent2 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + n2 = referent2; + printf("0x%lx", n2); goto l42; } @@ -70318,7 +70383,8 @@ putchar(' '); printOopShort(longAt((oop2 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + /* begin printHexnp: */ + printf("0x%lx", longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); l41: ; } l42: /* end printOopShortInner: */; @@ -70463,11 +70529,13 @@ sqInt classTablePage; sqInt classTablePage1; sqInt i; + sqInt n; char *name; sqInt nameLen; sqInt objOop; sqInt objOop1; sqInt objOop2; + sqInt referent; sqInt theClass1; /* begin printOopShortInner: */ @@ -70479,19 +70547,29 @@ putchar(((usqInt) (((usqInt)oop))) >> 2); /* begin printChar: */ putchar('('); - printHex((oop >> 1)); + /* begin printHexnp: */ + printf("0x%lx", (oop >> 1)); /* begin printChar: */ putchar(')'); goto l7; } - printNum((oop >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop & 1)) { + printNum((oop >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop >> 1)); + /* begin printChar: */ + putchar(')'); + goto l7; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop); + goto l7; } if (!(addressCouldBeObj(oop))) { @@ -70506,7 +70584,16 @@ } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { print(" is a forwarder to "); - printHex(followForwarded(oop)); + /* begin printHexnp: */ + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(oop)); + referent = longAt((oop + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); + } + n = referent; + printf("0x%lx", n); goto l7; } @@ -70667,7 +70754,8 @@ putchar(' '); printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + /* begin printHexnp: */ + printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); l1: ; } l7: /* end printOopShortInner: */; @@ -72100,7 +72188,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(page)); + printf("0x%lx", oopForPointer(page)); /* begin cr */ printf("\n"); shortPrintFramesInPage(page); @@ -72125,7 +72213,7 @@ shortPrintOop(sqInt oop) { /* begin printHexnp: */ - printf("0x%x", oop); + printf("0x%lx", oop); if ((oop & 3) != 0) { if ((oop & 1)) { printf("=%ld\n", (long)integerValueOf(oop)); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-12-17 22:59:41 UTC (rev 3191) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-12-18 22:22:19 UTC (rev 3192) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-17 22:59:41 UTC (rev 3191) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-18 22:22:19 UTC (rev 3192) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 from - CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2353,7 +2353,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.991"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.992"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -23350,7 +23350,7 @@ putchar(' '); if (p > 1024) { /* begin printHexnp: */ - printf("0x%x", p); + printf("0x%lx", p); } else { printNum(p); @@ -59242,27 +59242,27 @@ print("freeChunk "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(freeChunk)); + printf("0x%lx", oopForPointer(freeChunk)); print(" bytes "); printNum(numBytes); print(" next "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))); if ((numBytes >= (32 * 8)) && (!isNextChunk)) { print(" ^ "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))); print(" < "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))); print(" > "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (4 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (4 << (shiftForWord()))))); } /* begin cr */ printf("\n"); @@ -59293,10 +59293,10 @@ printf("\n"); print("mask: "); /* begin printHexnp: */ - printf("0x%x", GIV(freeListsMask)); + printf("0x%lx", GIV(freeListsMask)); print(" expected: "); /* begin printHexnp: */ - printf("0x%x", expectedMask); + printf("0x%lx", expectedMask); /* begin cr */ printf("\n"); } @@ -66828,17 +66828,17 @@ printNameOfClasscount(class, 5); print(" ("); /* begin printHexnp: */ - printf("0x%x", (longAt(oop)) & 0x3FFFFF); + printf("0x%lx", (longAt(oop)) & 0x3FFFFF); print("=>"); /* begin printHexnp: */ - printf("0x%x", class); + printf("0x%lx", class); print(")"); } fmt = (((usqInt) (longAt(oop))) >> 24) & 0x1F; print(" format "); /* begin printHexnp: */ - printf("0x%x", fmt); + printf("0x%lx", fmt); if (fmt > 5) { print(" nbytes "); printNum(numBytesOf(oop)); @@ -66905,7 +66905,7 @@ putchar(aByte4); print(" hash "); /* begin printHexnp: */ - printf("0x%x", (long32At(oop + 4)) & 0x3FFFFF); + printf("0x%lx", (long32At(oop + 4)) & 0x3FFFFF); /* begin cr */ printf("\n"); if (((fmt >= 16) && (fmt <= (24 - 1)))) { @@ -69447,7 +69447,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(page)); + printf("0x%lx", oopForPointer(page)); /* begin cr */ printf("\n"); printFramesInPage(page); @@ -69583,6 +69583,9 @@ sqInt i2; sqInt limit; sqInt methodClassAssociation; + sqInt n; + sqInt n1; + sqInt n2; char *name; char *name1; char *name2; @@ -69613,6 +69616,9 @@ sqInt prevObj1; sqInt prevPrevObj; sqInt prevPrevObj1; + sqInt referent; + sqInt referent1; + sqInt referent2; sqInt theClass1; sqInt theClass11; sqInt theClass12; @@ -69644,7 +69650,7 @@ offset = (literalCountOf(objOop1)) - 1; methodClassAssociation = longAt((objOop1 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%x", objOop1); + printf("0x%lx", objOop1); /* begin space */ /* begin printChar: */ putchar(' '); @@ -69662,19 +69668,29 @@ putchar(((usqInt) (((usqInt)oop))) >> 2); /* begin printChar: */ putchar('('); - printHex((oop >> 1)); + /* begin printHexnp: */ + printf("0x%lx", (oop >> 1)); /* begin printChar: */ putchar(')'); goto l27; } - printNum((oop >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop & 1)) { + printNum((oop >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop >> 1)); + /* begin printChar: */ + putchar(')'); + goto l27; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop); + goto l27; } if (!(addressCouldBeObj(oop))) { @@ -69689,7 +69705,16 @@ } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { print(" is a forwarder to "); - printHex(followForwarded(oop)); + /* begin printHexnp: */ + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(oop)); + referent = longAt((oop + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); + } + n = referent; + printf("0x%lx", n); goto l27; } @@ -69850,7 +69875,8 @@ putchar(' '); printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + /* begin printHexnp: */ + printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); l22: ; } l27: /* end printOopShortInner: */; @@ -69880,7 +69906,7 @@ offset = (literalCountOf(objOop1)) - 1; methodClassAssociation = longAt((objOop1 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%x", objOop1); + printf("0x%lx", objOop1); /* begin space */ /* begin printChar: */ putchar(' '); @@ -69898,19 +69924,29 @@ putchar(((usqInt) (((usqInt)oop1))) >> 2); /* begin printChar: */ putchar('('); - printHex((oop1 >> 1)); + /* begin printHexnp: */ + printf("0x%lx", (oop1 >> 1)); /* begin printChar: */ putchar(')'); goto l35; } - printNum((oop1 >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop1 >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop1 & 1)) { + printNum((oop1 >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop1 >> 1)); + /* begin printChar: */ + putchar(')'); + goto l35; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop1); + goto l35; } if (!(addressCouldBeObj(oop1))) { @@ -69925,7 +69961,16 @@ } if (((longAt(oop1)) & (0x3FFFFF - 8)) == 0) { print(" is a forwarder to "); - printHex(followForwarded(oop1)); + /* begin printHexnp: */ + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(oop1)); + referent1 = longAt((oop1 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent1 & 3) == 0) + && (((longAt(referent1)) & 0x3FFFFF) == 8)) { + referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + n1 = referent1; + printf("0x%lx", n1); goto l35; } @@ -70086,7 +70131,8 @@ putchar(' '); printOopShort(longAt((oop1 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop1 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + /* begin printHexnp: */ + printf("0x%lx", longAt((oop1 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); l34: ; } l35: /* end printOopShortInner: */; @@ -70121,7 +70167,7 @@ offset = (literalCountOf(objOop11)) - 1; methodClassAssociation = longAt((objOop11 + BaseHeaderSize) + ((offset + LiteralStart) << (shiftForWord()))); /* begin printHexnp: */ - printf("0x%x", objOop11); + printf("0x%lx", objOop11); /* begin space */ /* begin printChar: */ putchar(' '); @@ -70139,19 +70185,29 @@ putchar(((usqInt) (((usqInt)oop2))) >> 2); /* begin printChar: */ putchar('('); - printHex((oop2 >> 1)); + /* begin printHexnp: */ + printf("0x%lx", (oop2 >> 1)); /* begin printChar: */ putchar(')'); goto l42; } - printNum((oop2 >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop2 >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop2 & 1)) { + printNum((oop2 >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop2 >> 1)); + /* begin printChar: */ + putchar(')'); + goto l42; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop2); + goto l42; } if (!(addressCouldBeObj(oop2))) { @@ -70166,7 +70222,16 @@ } if (((longAt(oop2)) & (0x3FFFFF - 8)) == 0) { print(" is a forwarder to "); - printHex(followForwarded(oop2)); + /* begin printHexnp: */ + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(oop2)); + referent2 = longAt((oop2 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent2 & 3) == 0) + && (((longAt(referent2)) & 0x3FFFFF) == 8)) { + referent2 = longAt((referent2 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + n2 = referent2; + printf("0x%lx", n2); goto l42; } @@ -70327,7 +70392,8 @@ putchar(' '); printOopShort(longAt((oop2 + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + /* begin printHexnp: */ + printf("0x%lx", longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); l41: ; } l42: /* end printOopShortInner: */; @@ -70472,11 +70538,13 @@ sqInt classTablePage; sqInt classTablePage1; sqInt i; + sqInt n; char *name; sqInt nameLen; sqInt objOop; sqInt objOop1; sqInt objOop2; + sqInt referent; sqInt theClass1; /* begin printOopShortInner: */ @@ -70488,19 +70556,29 @@ putchar(((usqInt) (((usqInt)oop))) >> 2); /* begin printChar: */ putchar('('); - printHex((oop >> 1)); + /* begin printHexnp: */ + printf("0x%lx", (oop >> 1)); /* begin printChar: */ putchar(')'); goto l7; } - printNum((oop >> 1)); - /* begin printChar: */ - putchar('('); - printHex((oop >> 1)); - /* begin printChar: */ - putchar(')'); + if ((oop & 1)) { + printNum((oop >> 1)); + /* begin printChar: */ + putchar('('); + /* begin printHexnp: */ + printf("0x%lx", (oop >> 1)); + /* begin printChar: */ + putchar(')'); + goto l7; + } + + print("unknown immediate "); + /* begin printHexnp: */ + printf("0x%lx", oop); + goto l7; } if (!(addressCouldBeObj(oop))) { @@ -70515,7 +70593,16 @@ } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { print(" is a forwarder to "); - printHex(followForwarded(oop)); + /* begin printHexnp: */ + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(oop)); + referent = longAt((oop + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); + } + n = referent; + printf("0x%lx", n); goto l7; } @@ -70676,7 +70763,8 @@ putchar(' '); printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << (shiftForWord())))); print(" -> "); - printHex(longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); + /* begin printHexnp: */ + printf("0x%lx", longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))); l1: ; } l7: /* end printOopShortInner: */; @@ -72109,7 +72197,7 @@ print("page "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(page)); + printf("0x%lx", oopForPointer(page)); /* begin cr */ printf("\n"); shortPrintFramesInPage(page); @@ -72134,7 +72222,7 @@ shortPrintOop(sqInt oop) { /* begin printHexnp: */ - printf("0x%x", oop); + printf("0x%lx", oop); if ((oop & 3) != 0) { if ((oop & 1)) { printf("=%ld\n", (long)integerValueOf(oop)); Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-12-17 22:59:41 UTC (rev 3191) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-12-18 22:22:19 UTC (rev 3192) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 from - StackInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 + StackInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2099,7 +2099,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.991"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.992"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -45188,27 +45188,27 @@ print("freeChunk "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(freeChunk)); + printf("0x%lx", oopForPointer(freeChunk)); print(" bytes "); printNum(numBytes); print(" next "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (0 << (shiftForWord()))))); if ((numBytes >= (32 * 8)) && (!isNextChunk)) { print(" ^ "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (2 << (shiftForWord()))))); print(" < "); /* begin printHexPtrnp: */ /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))); + printf("0x%lx", oopForPointer(longAt((freeChunk + BaseHeaderSize) + (3 << (shiftForWord()))))); print(" > "); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.992.mcz
by commits＠source.squeak.org 18 Dec '14

18 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.992.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.992 Author: eem Time: 18 December 2014, 2:02:17.161 pm UUID: bbbe8c5f-97d3-42fe-b068-76c6890a1733 Ancestors: VMMaker.oscog-eem.991 64-bit Spur: Correct a few comparisons and shifts in small float code to make comparisons in generated C correct. Move loadFloatOrInt: into the ObjectMemory hierarchies to allow Spur64BitMemoryManager to generate better code. Make printOopShortInner: small-float savvy. Make printHexnp: 64-bit aware. Can now interact with a 64-bit Spur image. =============== Diff against VMMaker.oscog-eem.991 =============== Item was removed: - ----- Method: Interpreter>>loadFloatOrIntFrom: (in category 'utilities') ----- - loadFloatOrIntFrom: floatOrInt - "If floatOrInt is an integer, then convert it to a C double float and return it. - If it is a Float, then load its value and return it. - Otherwise fail -- ie return with primErrorCode non-zero." - - <inline: true> - <returnTypeC: #double> - - (self isIntegerObject: floatOrInt) ifTrue: - [^(self integerValueOf: floatOrInt) asFloat]. - ^self floatValueOf: floatOrInt! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatAdd (in category 'arithmetic float primitives') ----- primitiveSmallFloatAdd <option: #Spur64BitMemoryManager> | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory loadFloatOrIntFrom: self stackTop. - arg := self loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self pop: 2 thenPushFloat: rcvr + arg]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatDivide (in category 'arithmetic float primitives') ----- primitiveSmallFloatDivide <option: #Spur64BitMemoryManager> | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory loadFloatOrIntFrom: self stackTop. - arg := self loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self pop: 2 thenPushFloat: rcvr / arg]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatEqual <option: #Spur64BitMemoryManager> | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory loadFloatOrIntFrom: self stackTop. - arg := self loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self pop: 2 thenPushBool: rcvr = arg]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatGreaterOrEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatGreaterOrEqual <option: #Spur64BitMemoryManager> | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory loadFloatOrIntFrom: self stackTop. - arg := self loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self pop: 2 thenPushBool: rcvr >= arg]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatGreaterThan (in category 'arithmetic float primitives') ----- primitiveSmallFloatGreaterThan <option: #Spur64BitMemoryManager> | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory loadFloatOrIntFrom: self stackTop. - arg := self loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self pop: 2 thenPushBool: rcvr > arg]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatLessOrEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatLessOrEqual <option: #Spur64BitMemoryManager> | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory loadFloatOrIntFrom: self stackTop. - arg := self loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self pop: 2 thenPushBool: rcvr <= arg]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatLessThan (in category 'arithmetic float primitives') ----- primitiveSmallFloatLessThan <option: #Spur64BitMemoryManager> | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory loadFloatOrIntFrom: self stackTop. - arg := self loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self pop: 2 thenPushBool: rcvr < arg]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatMultiply (in category 'arithmetic float primitives') ----- primitiveSmallFloatMultiply <option: #Spur64BitMemoryManager> | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory loadFloatOrIntFrom: self stackTop. - arg := self loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self pop: 2 thenPushFloat: rcvr * arg]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatNotEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatNotEqual <option: #Spur64BitMemoryManager> | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory loadFloatOrIntFrom: self stackTop. - arg := self loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self pop: 2 thenPushBool: (rcvr = arg) not]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatSubtract (in category 'arithmetic float primitives') ----- primitiveSmallFloatSubtract <option: #Spur64BitMemoryManager> | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory loadFloatOrIntFrom: self stackTop. - arg := self loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self pop: 2 thenPushFloat: rcvr - arg]! Item was removed: - ----- Method: NewspeakInterpreter>>loadFloatOrIntFrom: (in category 'utilities') ----- - loadFloatOrIntFrom: floatOrInt - "If floatOrInt is an integer, then convert it to a C double float and return it. - If it is a Float, then load its value and return it. - Otherwise fail -- ie return with primErrorCode non-zero." - - <inline: true> - <returnTypeC: #double> - - (self isIntegerObject: floatOrInt) ifTrue: - [^(self integerValueOf: floatOrInt) asFloat]. - ^self floatValueOf: floatOrInt! Item was added: + ----- Method: ObjectMemory>>loadFloatOrIntFrom: (in category 'interpreter access') ----- + loadFloatOrIntFrom: floatOrInt + "If floatOrInt is an integer, then convert it to a C double float and return it. + If it is a Float, then load its value and return it. + Otherwise fail -- ie return with primErrorCode non-zero." + + <inline: true> + <returnTypeC: #double> + + (self isIntegerObject: floatOrInt) ifTrue: + [^(self integerValueOf: floatOrInt) asFloat]. + ^self floatValueOf: floatOrInt! Item was added: + ----- Method: Spur32BitMemoryManager>>loadFloatOrIntFrom: (in category 'interpreter access') ----- + loadFloatOrIntFrom: floatOrInt + "If floatOrInt is an integer, then convert it to a C double float and return it. + If it is a Float, then load its value and return it. + Otherwise fail -- ie return with primErrorCode non-zero." + + <inline: true> + <returnTypeC: #double> + + (self isIntegerObject: floatOrInt) ifTrue: + [^(self integerValueOf: floatOrInt) asFloat]. + ^self floatValueOf: floatOrInt! Item was changed: ----- Method: Spur64BitMemoryManager>>exponentOfSmallFloat: (in category 'interpreter access') ----- exponentOfSmallFloat: oop "Answer the exponent of the argument, a SmallFloat. See section 61-bit Immediate Floats in the SpurMemoryManager class comment. msb lsb [8expsubset][52mantissa][1s][3tags]" | exp | self assert: (oop bitAnd: self tagMask) = self smallFloatTag. + ^oop asUnsignedInteger <= 15 - ^oop <= 15 ifTrue: [0] ifFalse: + [exp := oop asUnsignedInteger >> (self numTagBits + self smallFloatMantissaBits + 1). - [exp := oop >> (self numTagBits + self smallFloatMantissaBits + 1). exp + self smallFloatExponentOffset - 1022]! Item was added: + ----- Method: Spur64BitMemoryManager>>loadFloatOrIntFrom: (in category 'interpreter access') ----- + loadFloatOrIntFrom: floatOrIntOop + "If floatOrInt is an integer, then convert it to a C double float and return it. + If it is a Float, then load its value and return it. + Otherwise fail -- ie return with primErrorCode non-zero." + + <inline: true> + <returnTypeC: #double> + | result tagBits | + <var: #result type: #double> + + (tagBits := floatOrIntOop bitAnd: self tagMask) ~= 0 + ifTrue: + [tagBits = self smallFloatTag ifTrue: + [^self smallFloatValueOf: floatOrIntOop]. + tagBits = self smallIntegerTag ifTrue: + [^(self integerValueOf: floatOrIntOop) asFloat]] + ifFalse: + [(self classIndexOf: floatOrIntOop) = ClassFloatCompactIndex ifTrue: + [self cCode: '' inSmalltalk: [result := Float new: 2]. + self fetchFloatAt: floatOrIntOop + self baseHeaderSize into: result. + ^result]]. + coInterpreter primitiveFail. + ^0.0! Item was changed: ----- Method: Spur64BitMemoryManager>>smallFloatObjectOf: (in category 'interpreter access') ----- smallFloatObjectOf: aFloat "Encode the argument, aFloat in the SmallFloat range, as a tagged small float. See section 61-bit Immediate Floats in the SpurMemoryManager class comment. Encode: [1s][ 11 exponent ][52mantissa] rot sign: [ 11 exponent ][52mantissa][1s] sub exponent offset: [ 000 ][8expsubset][52 mantissa][1s] shift: [8expsubset][52 mantissa][1s][ 000 ] or/add tags: [8expsubset][52mantissa][1s][3tags]" <inline: true> <var: #aFloat type: #double> | rawFloat rot | + <var: #rot type: #'unsigned long'> self assert: (self isSmallFloatValue: aFloat). rawFloat := self cCode: [(self cCoerce: (self addressOf: aFloat) to: 'sqLong *') at: 0] inSmalltalk: [(aFloat at: 1) << 32 + (aFloat at: 2)]. rot := self rotateLeft: rawFloat. rot > 1 ifTrue: [rot := rot - (self smallFloatExponentOffset << (self smallFloatMantissaBits + 1)). self assert: rot > 0]. ^self cCode: [rot << self numTagBits + self smallFloatTag] inSmalltalk: [((rot << self numTagBits) bitAnd: 16rFFFFFFFFFFFFFFFF) + self smallFloatTag]! Item was changed: ----- Method: Spur64BitMemoryManager>>smallFloatValueOf: (in category 'interpreter access') ----- smallFloatValueOf: oop "Answer the C double precision floating point value of the argument, a SmallFloat. See section 61-bit Immediate Floats in the SpurMemoryManager class comment. msb lsb Decode: [8expsubset][52mantissa][1s][3tags] shift away tags: [ 000 ][8expsubset][52mantissa][1s] add exponent offset: [ 11 exponent ][52mantissa][1s] rot sign: [1s][ 11 exponent ][52mantissa]" | rot | <returnTypeC: #double> self assert: (oop bitAnd: self tagMask) = self smallFloatTag. + rot := oop asUnsignedInteger >> self numTagBits. - rot := oop >> self numTagBits. rot > 1 ifTrue: [rot := rot + (self smallFloatExponentOffset << (self smallFloatMantissaBits + 1))]. rot := self rotateRight: rot. ^self cCode: [(self cCoerce: (self addressOf: rot) to: #'double *') at: 0] inSmalltalk: [(Float new: 2) at: 1 put: rot >> 32; at: 2 put: (rot bitAnd: 16rFFFFFFFF); yourself]! Item was added: + ----- Method: SpurMemoryManager>>loadFloatOrIntFrom: (in category 'interpreter access') ----- + loadFloatOrIntFrom: floatOrInt + "If floatOrInt is an integer, then convert it to a C double float and return it. + If it is a Float, then load its value and return it. + Otherwise fail -- ie return with primErrorCode non-zero." + + self subclassResponsibility! Item was removed: - ----- Method: StackInterpreter>>loadFloatOrIntFrom: (in category 'utilities') ----- - loadFloatOrIntFrom: floatOrInt - "If floatOrInt is an integer, then convert it to a C double float and return it. - If it is a Float, then load its value and return it. - Otherwise fail -- ie return with primErrorCode non-zero." - - <inline: true> - <returnTypeC: #double> - - (objectMemory isIntegerObject: floatOrInt) ifTrue: - [^(objectMemory integerValueOf: floatOrInt) asFloat]. - ^objectMemory floatValueOf: floatOrInt! Item was changed: ----- Method: StackInterpreter>>primitiveFloatAdd:toArg: (in category 'arithmetic float primitives') ----- primitiveFloatAdd: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> + rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. + arg := objectMemory loadFloatOrIntFrom: argOop. - rcvr := self loadFloatOrIntFrom: rcvrOop. - arg := self loadFloatOrIntFrom: argOop. self successful ifTrue: [self pop: 2 thenPushFloat: rcvr + arg]! Item was changed: ----- Method: StackInterpreter>>primitiveFloatDivide:byArg: (in category 'arithmetic float primitives') ----- primitiveFloatDivide: rcvrOop byArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> + rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. + arg := objectMemory loadFloatOrIntFrom: argOop. - rcvr := self loadFloatOrIntFrom: rcvrOop. - arg := self loadFloatOrIntFrom: argOop. self success: arg ~= 0.0. self successful ifTrue: [self pop: 2 thenPushFloat: rcvr / arg]! Item was changed: ----- Method: StackInterpreter>>primitiveFloatEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> + rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. + arg := objectMemory loadFloatOrIntFrom: argOop. - rcvr := self loadFloatOrIntFrom: rcvrOop. - arg := self loadFloatOrIntFrom: argOop. ^rcvr = arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatGreater:thanArg: (in category 'comparison float primitives') ----- primitiveFloatGreater: rcvrOop thanArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> + rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. + arg := objectMemory loadFloatOrIntFrom: argOop. - rcvr := self loadFloatOrIntFrom: rcvrOop. - arg := self loadFloatOrIntFrom: argOop. ^rcvr > arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatGreaterOrEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatGreaterOrEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> + rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. + arg := objectMemory loadFloatOrIntFrom: argOop. - rcvr := self loadFloatOrIntFrom: rcvrOop. - arg := self loadFloatOrIntFrom: argOop. ^rcvr >= arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatLess:thanArg: (in category 'comparison float primitives') ----- primitiveFloatLess: rcvrOop thanArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> + rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. + arg := objectMemory loadFloatOrIntFrom: argOop. - rcvr := self loadFloatOrIntFrom: rcvrOop. - arg := self loadFloatOrIntFrom: argOop. ^rcvr < arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatLessOrEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatLessOrEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> + rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. + arg := objectMemory loadFloatOrIntFrom: argOop. - rcvr := self loadFloatOrIntFrom: rcvrOop. - arg := self loadFloatOrIntFrom: argOop. ^rcvr <= arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatMultiply:byArg: (in category 'arithmetic float primitives') ----- primitiveFloatMultiply: rcvrOop byArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> + rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. + arg := objectMemory loadFloatOrIntFrom: argOop. - rcvr := self loadFloatOrIntFrom: rcvrOop. - arg := self loadFloatOrIntFrom: argOop. self successful ifTrue: [self pop: 2 thenPushFloat: rcvr * arg]! Item was changed: ----- Method: StackInterpreter>>primitiveFloatSubtract:fromArg: (in category 'arithmetic float primitives') ----- primitiveFloatSubtract: rcvrOop fromArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> + rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. + arg := objectMemory loadFloatOrIntFrom: argOop. - rcvr := self loadFloatOrIntFrom: rcvrOop. - arg := self loadFloatOrIntFrom: argOop. self successful ifTrue: [self pop: 2 thenPushFloat: rcvr - arg]! Item was changed: ----- Method: StackInterpreter>>printHexnp: (in category 'debug printing') ----- printHexnp: n "Print n in hex, in the form '0x1234', unpadded" + self print: '0x%lx' f: n! - self print: '0x%x' f: n! Item was changed: ----- Method: StackInterpreter>>printOopShortInner: (in category 'debug printing') ----- printOopShortInner: oop | classOop name nameLen | <var: #name type: #'char *'> <inline: true> (objectMemory isImmediate: oop) ifTrue: [(objectMemory isImmediateCharacter: oop) ifTrue: [^self printChar: $$; printChar: (objectMemory characterValueOf: oop); printChar: $(; + printHexnp: (objectMemory integerValueOf: oop); - printHex: (objectMemory integerValueOf: oop); printChar: $)]. + (objectMemory isIntegerObject: oop) ifTrue: + [^self + printNum: (objectMemory integerValueOf: oop); + printChar: $(; + printHexnp: (objectMemory integerValueOf: oop); + printChar: $)]. + (objectMemory isImmediateFloat: oop) ifTrue: + [^self + printFloat: (objectMemory dbgFloatValueOf: oop); + printChar: $(; + printHexnp: oop; + printChar: $)]. + ^self print: 'unknown immediate '; printHexnp: oop]. - ^self - printNum: (objectMemory integerValueOf: oop); - printChar: $(; - printHex: (objectMemory integerValueOf: oop); - printChar: $)]. (objectMemory addressCouldBeObj: oop) ifFalse: [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop])]. (objectMemory isFreeObject: oop) ifTrue: [^self print: ' is a free chunk']. (objectMemory isForwarded: oop) ifTrue: + [^self print: ' is a forwarder to '; printHexnp: (objectMemory followForwarded: oop)]. - [^self print: ' is a forwarder to '; printHex: (objectMemory followForwarded: oop)]. (self isFloatObject: oop) ifTrue: [^self printFloat: (objectMemory dbgFloatValueOf: oop)]. classOop := objectMemory fetchClassOfNonImm: oop. (objectMemory addressCouldBeObj: classOop) ifFalse: [^self print: 'a ??']. (objectMemory numSlotsOf: classOop) = metaclassNumSlots ifTrue: [^self printNameOfClass: oop count: 5]. oop = objectMemory nilObject ifTrue: [^self print: 'nil']. oop = objectMemory trueObject ifTrue: [^self print: 'true']. oop = objectMemory falseObject ifTrue: [^self print: 'false']. nameLen := self lengthOfNameOfClass: classOop. nameLen = 0 ifTrue: [^self print: 'a ??']. name := self nameOfClass: classOop. nameLen = 10 ifTrue: [(self str: name n: 'ByteString' cmp: 10) = 0 "strncmp is weird" ifTrue: [^self printChar: $'; printStringOf: oop; printChar: $']. (self str: name n: 'ByteSymbol' cmp: 10) = 0 "strncmp is weird" ifTrue: [self printChar: $#; printStringOf: oop. ^self]]. (nameLen = 9 and: [(self str: name n: 'Character' cmp: 9) = 0]) ifTrue: [^self printChar: $$; printChar: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop))]. self print: 'a(n) '. self cCode: [0 to: nameLen - 1 do: [:i| self printChar: (name at: i)]] inSmalltalk: [name isString ifTrue: [self print: name] ifFalse: [0 to: nameLen - 1 do: [:i| self printChar: (name at: i)]]]. "Try to spot association-like things; they're all subclasses of LookupKey" ((objectMemory isPointersNonImm: oop) and: [(objectMemory instanceSizeOf: classOop) = (ValueIndex + 1) and: [(objectMemory isBytes: (objectMemory fetchPointer: KeyIndex ofObject: oop))]]) ifTrue: [| classLookupKey | classLookupKey := objectMemory fetchClassOfNonImm: (objectMemory splObj: SchedulerAssociation). [classLookupKey = objectMemory nilObject ifTrue: [^self]. (objectMemory instanceSizeOf: classLookupKey) = (KeyIndex + 1)] whileFalse: [classLookupKey := self superclassOf: classLookupKey]. (self includesBehavior: classOop ThatOf: classLookupKey) ifTrue: [self space; printOopShort: (objectMemory fetchPointer: KeyIndex ofObject: oop); print: ' -> '; + printHexnp: (objectMemory fetchPointer: ValueIndex ofObject: oop)]]! - printHex: (objectMemory fetchPointer: ValueIndex ofObject: oop)]]!

1 0

VM Maker: Cog-eem.229.mcz
by commits＠source.squeak.org 18 Dec '14

18 Dec '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.229.mcz ==================== Summary ==================== Name: Cog-eem.229 Author: eem Time: 18 December 2014, 1:39:22.561 pm UUID: 9d911f27-07b2-406f-8b8c-59684644d6a9 Ancestors: Cog-eem.228 Spur Bootstrap: Map floats that can be to immediate floats. Add a prototype for SmallInteger>>decimalDigitLength that copes with 64-bit SmallIntegers. =============== Diff against Cog-eem.228 =============== Item was changed: ----- Method: Spur32to64BitBootstrap>>cloneObjects (in category 'bootstrap image') ----- cloneObjects "Clone all normal objects. Of hidden objects only clone the freeLists object and the classTableRoot and class table pages. In particular, dont clone objStacks. The refs to the objStacks are nilled out in fillInHeap." + | i freeListsObject | + i := 0. - | freeListsObject | freeListsObject := heap32 freeListsObject. heap32 allOldSpaceObjectsDo: + [:obj32| + (i := i + 1) >= 100000 ifTrue: + [Transcript nextPut: $:; flush. i := 0]. + obj32 = freeListsObject - [:obj32| | classIndex value | - classIndex := heap32 classIndexOf: obj32. - obj32 = freeListsObject ifTrue: [self cloneFreeLists: obj32] ifFalse: + [(self shouldClone: obj32) ifTrue: + [self clone: obj32]]]! - [(heap32 isValidObjStackPage: obj32) ifFalse: - [((classIndex between: ClassLargeNegativeIntegerCompactIndex and: ClassLargePositiveIntegerCompactIndex) - and: [interpreter32 initPrimCall. - value := interpreter32 signed64BitValueOf: obj32. - interpreter32 failed not - and: [heap64 isIntegerValue: value]]) ifFalse: - [self clone: obj32]]]]! Item was changed: ----- Method: Spur32to64BitBootstrap>>fillInObjects (in category 'bootstrap image') ----- fillInObjects "interpreter32 printOop: obj32" + | i | {heap32 markStack. heap32 weaklingStack. heap32 ephemeronQueue} do: [:obj| obj ~= heap32 nilObject ifTrue: [map at: obj put: (map at: heap32 nilObject)]]. + i := 0. heap32 allObjectsDo: [:obj32| + (i := i + 1) >= 10000 ifTrue: + [Transcript nextPut: $.; flush. i := 0]. (map at: obj32 ifAbsent: nil) ifNotNil: [:obj64| | format classIndex | (heap64 numSlotsOf: obj64) > 0 ifTrue: "filter-out filtered objStack pages" [format := heap32 formatOf: obj32. (heap64 isPointersFormat: format) ifTrue: [((heap64 isIndexableFormat: format) and: [(classIndex := heap64 classIndexOf: obj64) <= ClassBlockClosureCompactIndex and: [classIndex >= ClassMethodContextCompactIndex]]) ifTrue: [self fillInPointerObjectWithPC: obj64 from: obj32] ifFalse: [self fillInPointerObject: obj64 from: obj32]] ifFalse: [(heap64 isCompiledMethodFormat: format) ifTrue: [self fillInCompiledMethod: obj64 from: obj32] ifFalse: [self fillInBitsObject: obj64 from: obj32]]]] ifNil: [self assert: (self isUnmappedObject: obj32)]]! Item was changed: ----- Method: Spur32to64BitBootstrap>>isUnmappedObject: (in category 'bootstrap image') ----- isUnmappedObject: obj32 "Answer if obj32 is an object that is not cloned by the bootstrap." ^((heap32 classIndexOf: obj32) between: ClassLargeNegativeIntegerCompactIndex + and: ClassFloatCompactIndex) - and: ClassLargePositiveIntegerCompactIndex) or: [obj32 = heap32 freeListsObject + or: [(heap32 isValidObjStackPage: obj32)]]! - or: [heap32 isValidObjStackPage: obj32]]! Item was changed: ----- Method: Spur32to64BitBootstrap>>map32BitOop: (in category 'bootstrap image') ----- + map32BitOop: obj32 + "interpreter32 printOop: obj32" - map32BitOop: oop32 - "interpreter32 printOop: oop32" ^map + at: obj32 - at: oop32 ifAbsent: + [(heap32 isImmediate: obj32) - [(heap32 isImmediate: oop32) ifTrue: + [(heap32 isImmediateCharacter: obj32) + ifTrue: [heap64 characterObjectOf: (heap32 characterValueOf: obj32)] + ifFalse: [heap64 integerObjectOf: (heap32 integerValueOf: obj32)]] - [(heap32 isImmediateCharacter: oop32) - ifTrue: [heap64 characterObjectOf: (heap32 characterValueOf: oop32)] - ifFalse: [heap64 integerObjectOf: (heap32 integerValueOf: oop32)]] ifFalse: [| value | + self assert: (self isUnmappedObject: obj32). + (heap32 isFloatInstance: obj32) + ifTrue: + [heap64 smallFloatObjectOf: (heap32 floatValueOf: obj32)] + ifFalse: + [interpreter32 initPrimCall. + value := interpreter32 signed64BitValueOf: obj32. + self deny: interpreter32 failed. + heap64 integerObjectOf: value]]]! - self assert: (self isUnmappedObject: oop32). - interpreter32 initPrimCall. - value := interpreter32 signed64BitValueOf: oop32. - self deny: interpreter32 failed. - heap64 integerObjectOf: value]]! Item was added: + ----- Method: Spur32to64BitBootstrap>>shouldClone: (in category 'bootstrap image') ----- + shouldClone: obj32 + | classIndex value | + (heap32 isValidObjStackPage: obj32) ifTrue: + [^false]. + + classIndex := heap32 classIndexOf: obj32. + + ((classIndex between: ClassLargeNegativeIntegerCompactIndex and: ClassLargePositiveIntegerCompactIndex) + and: [interpreter32 initPrimCall. + value := interpreter32 signed64BitValueOf: obj32. + interpreter32 failed not + and: [heap64 isIntegerValue: value]]) ifTrue: + [^false]. + + (classIndex = ClassFloatCompactIndex + and: [value := heap32 floatValueOf: obj32. + heap64 isSmallFloatValue: value]) ifTrue: + [^false]. + + ^true! Item was added: + ----- Method: SpurBootstrapPrototypes>>SmallIntegerPROTOTYPEdecimalDigitLength (in category 'method prototypes') ----- + SmallIntegerPROTOTYPEdecimalDigitLength + "Answer the number of digits printed out in base 10. + Note that this only works for positive SmallIntegers up to 64-bits." + + ^self < 10000 + ifTrue: + [self < 100 + ifTrue: + [self < 10 ifTrue: [1] ifFalse: [2]] + ifFalse: + [self < 1000 ifTrue: [3] ifFalse: [4]]] + ifFalse: + [self < 100000000 + ifTrue: + [self < 1000000 + ifTrue: [self < 100000 ifTrue: [5] ifFalse: [6]] + ifFalse: [self < 10000000 ifTrue: [7] ifFalse: [8]]] + ifFalse: + [self < 1000000000000 + ifTrue: + [self < 10000000000 + ifTrue: [self < 1000000000 ifTrue: [9] ifFalse: [10]] + ifFalse: [self < 100000000000 ifTrue: [11] ifFalse: [12]]] + ifFalse: + [self < 10000000000000000 + ifTrue: + [self < 100000000000000 + ifTrue: [self < 10000000000000 ifTrue: [13] ifFalse: [14]] + ifFalse: [self < 1000000000000000 ifTrue: [15] ifFalse: [16]]] + ifFalse: + [self < 1000000000000000000 + ifTrue: [self < 100000000000000000 ifTrue: [17] ifFalse: [18]] + ifFalse: [self < 10000000000000000000 ifTrue: [19] ifFalse: [20]]]]]]!

1 0

'Squeak-4.5-All-in-One.zip packaging breaks scripts in Cog/image
by gettimothy 18 Dec '14

18 Dec '14

Hi guys, The packaging of the 'Squeak-4.5-All-in-One.zip breaks several scripts in Cog/image When unzipped it produces this directory structure. Squeak-4.5-All-In-One/Squeak-4.5-All-in-One.app/Contents... which is one more level than used to be there. Also, I notice the modular approach to the scripts that have been added vs the monolithic behemoth I submitted. I have no ego in this, so its up to you. Should I update the buildsqueakcmakeimage.sh script ? modularize it? ditch it? thx. tty

2 1

[commit][3191] Set ignore properties on the 64-bit build directories.
by commits＠squeakvm.org 17 Dec '14

17 Dec '14

Revision: 3191 Author: eliot Date: 2014-12-17 14:59:41 -0800 (Wed, 17 Dec 2014) Log Message: ----------- Set ignore properties on the 64-bit build directories. Property Changed: ---------------- branches/Cog/build.linux64x64/newspeak.cog.spur/build/ branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert/ branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug/ branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/ branches/Cog/build.linux64x64/newspeak.sista.spur/build/ branches/Cog/build.linux64x64/newspeak.sista.spur/build.assert/ branches/Cog/build.linux64x64/newspeak.sista.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux64x64/newspeak.sista.spur/build.debug/ branches/Cog/build.linux64x64/newspeak.sista.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux64x64/newspeak.sista.spur/build.itimerheartbeat/ branches/Cog/build.linux64x64/newspeak.stack.spur/build/ branches/Cog/build.linux64x64/newspeak.stack.spur/build.assert/ branches/Cog/build.linux64x64/newspeak.stack.spur/build.debug/ branches/Cog/build.linux64x64/squeak.cog.spur/build/ branches/Cog/build.linux64x64/squeak.cog.spur/build.assert/ branches/Cog/build.linux64x64/squeak.cog.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux64x64/squeak.cog.spur/build.debug/ branches/Cog/build.linux64x64/squeak.cog.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux64x64/squeak.cog.spur/build.itimerheartbeat/ branches/Cog/build.linux64x64/squeak.sista.spur/build/ branches/Cog/build.linux64x64/squeak.sista.spur/build.assert/ branches/Cog/build.linux64x64/squeak.sista.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux64x64/squeak.sista.spur/build.debug/ branches/Cog/build.linux64x64/squeak.sista.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux64x64/squeak.sista.spur/build.itimerheartbeat/ branches/Cog/build.linux64x64/squeak.stack.spur/build/ branches/Cog/build.linux64x64/squeak.stack.spur/build.assert/ branches/Cog/build.linux64x64/squeak.stack.spur/build.debug/ branches/Cog/build.macos64x64/newspeak.cog.spur/ branches/Cog/build.macos64x64/newspeak.stack.spur/ branches/Cog/build.macos64x64/squeak.cog.spur/ branches/Cog/build.macos64x64/squeak.sista.spur/ branches/Cog/build.macos64x64/squeak.stack.spur/ Property changes on: branches/Cog/build.linux64x64/newspeak.cog.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.cog.spur/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.sista.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.sista.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.sista.spur/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.sista.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.sista.spur/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.sista.spur/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.stack.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.stack.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/newspeak.stack.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.cog.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.cog.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.cog.spur/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.cog.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.cog.spur/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.cog.spur/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.sista.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.sista.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.sista.spur/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.sista.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.sista.spur/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.sista.spur/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.stack.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.stack.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux64x64/squeak.stack.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.macos64x64/newspeak.cog.spur ___________________________________________________________________ Added: svn:ignore + build *.app *.bundle LOG* *.sources sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/newspeak.stack.spur ___________________________________________________________________ Added: svn:ignore + build *.app *.bundle LOG* *.sources sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.cog.spur ___________________________________________________________________ Added: svn:ignore + build *.app *.bundle LOG* *.sources sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.sista.spur ___________________________________________________________________ Added: svn:ignore + build *.app *.bundle LOG* *.sources sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur ___________________________________________________________________ Added: svn:ignore + build *.app *.bundle LOG* *.sources sqNamedPrims.h

1 0

[commit][3190] CogVM source as per VMMaker.oscog-eem.991
by commits＠squeakvm.org 17 Dec '14

17 Dec '14

Revision: 3190 Author: eliot Date: 2014-12-17 14:30:32 -0800 (Wed, 17 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.991 Fix bitInvert32 for 64-bits. Now window border colours are correct in the 64-bit Spur Stack linux VM. Cast a left shift to long if in the 64-bit interpreter code. Fix printFreeListHeads Update the ScratchPlugin bilinear scaling prim to include the correct alpha channel value for non-transparent output pixels. Add boundary cases for isSmallFloatValue: Fix isSmallFloatValue: for the low boundary case. Fix generateIsIntegerObject:on:indent: for 64-bit Spur. Make primitiveFloatAt support immedate floats. Fix the regression of breakmnu (breakSelectorLength must be initialized early). Make shortPrintOop: print immediate floats. Double the stack page size for 64-bits. No longer build or upload the Newspeak V3 VMs, now superceded by Spur. Modified Paths: -------------- branches/Cog/build.linux32ARM/makeproduct branches/Cog/build.linux32x86/makeproduct branches/Cog/build.macos32x86/makeproduct branches/Cog/build.win32x86/makeproduct branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/mkcogvmarchives branches/Cog/scripts/uploadvms branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32ARM/makeproduct =================================================================== --- branches/Cog/build.linux32ARM/makeproduct 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/build.linux32ARM/makeproduct 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -for d in newspeak.cog.spur newspeak.cog.spur squeak.cog.spur squeak.cog.v3; do +for d in newspeak.cog.spur squeak.cog.spur squeak.cog.v3; do if test -d "$d"; then (cd $d;./makeallclean "$@") else Modified: branches/Cog/build.linux32x86/makeproduct =================================================================== --- branches/Cog/build.linux32x86/makeproduct 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/build.linux32x86/makeproduct 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -for d in newspeak.cog.spur newspeak.cog.v3 squeak.cog.spur squeak.cog.v3; do +for d in newspeak.cog.spur squeak.cog.spur squeak.cog.v3; do if test -d "$d"; then (cd $d;./makeallclean "$@") else Modified: branches/Cog/build.macos32x86/makeproduct =================================================================== --- branches/Cog/build.macos32x86/makeproduct 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/build.macos32x86/makeproduct 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -PRODUCTDIRS="newspeak.cog.spur newspeak.cog.v3 squeak.cog.spur squeak.cog.v3" +PRODUCTDIRS="newspeak.cog.spur squeak.cog.spur squeak.cog.v3" for d in $PRODUCTDIRS; do if test -d "$d"; then (cd $d;./mvm -A) Modified: branches/Cog/build.win32x86/makeproduct =================================================================== --- branches/Cog/build.win32x86/makeproduct 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/build.win32x86/makeproduct 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -for d in newspeak.cog.spur newspeak.cog.v3 squeak.cog.spur squeak.cog.v3; do +for d in newspeak.cog.spur squeak.cog.spur squeak.cog.v3; do if test -d "$d"; then (cd $d;./mvm) else Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a from - BalloonEnginePlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + BalloonEnginePlugin VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a " __DATE__ ; @@ -836,9 +836,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.983 (i)" + "B2DPlugin VMMaker.oscog-eem.990 (i)" #else - "B2DPlugin VMMaker.oscog-eem.983 (e)" + "B2DPlugin VMMaker.oscog-eem.990 (e)" #endif ; static int* objBuffer; @@ -879,7 +879,7 @@ { sqInt firstPixel; - firstPixel = ((leftX + (workBuffer[GWAALevel])) - 1) & (~((workBuffer[GWAALevel]) - 1)); + firstPixel = ((leftX + (workBuffer[GWAALevel])) - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); if (firstPixel > rightX) { return rightX; } @@ -906,7 +906,7 @@ static sqInt aaLastPixelFromto(sqInt leftX, sqInt rightX) { - return (rightX - 1) & (~((workBuffer[GWAALevel]) - 1)); + return (rightX - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); } static sqInt @@ -1023,7 +1023,7 @@ sqInt x1; adjustShift = 8 - (workBuffer[GWAAColorShift]); - adjustMask = ~(workBuffer[GWAAColorMask]); + adjustMask = (unsigned int)~(workBuffer[GWAAColorMask]); x0 = ((usqInt) (workBuffer[GWSpanStart])) >> (workBuffer[GWAAShift]); x1 = ((usqInt) (workBuffer[GWSpanEnd])) >> (workBuffer[GWAAShift]); while (x0 < x1) { @@ -2567,7 +2567,7 @@ static sqInt edgeFillsValidate(sqInt edge) { - return objBuffer[edge + GEObjectType] = (((objBuffer[edge + GEObjectType]) & GEPrimitiveTypeMask) & (~GEEdgeFillsInvalid)); + return objBuffer[edge + GEObjectType] = (((objBuffer[edge + GEObjectType]) & GEPrimitiveTypeMask) & ((unsigned int)~GEEdgeFillsInvalid)); } static sqInt @@ -2876,7 +2876,7 @@ dt = (deltaX * dtX) + (deltaY * (objBuffer[bmFill + GFNormalY])); aaLevel = workBuffer[GWAALevel]; /* begin aaFirstPixelFrom:to: */ - firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & (~((workBuffer[GWAALevel]) - 1)); + firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); if (firstPixel1 > rightX) { firstPixel = rightX; goto l10; @@ -2886,7 +2886,7 @@ goto l10; } l10: /* end aaFirstPixelFrom:to: */; - lastPixel = (rightX - 1) & (~((workBuffer[GWAALevel]) - 1)); + lastPixel = (rightX - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); baseShift = workBuffer[GWAAShift]; cMask = workBuffer[GWAAColorMask]; cShift = workBuffer[GWAAColorShift]; @@ -3518,7 +3518,7 @@ /* Compute the pixel boundaries. */ /* begin aaFirstPixelFrom:to: */ - firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & (~((workBuffer[GWAALevel]) - 1)); + firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); if (firstPixel1 > rightX) { firstPixel = rightX; goto l1; @@ -3528,7 +3528,7 @@ goto l1; } l1: /* end aaFirstPixelFrom:to: */; - lastPixel = (rightX - 1) & (~((workBuffer[GWAALevel]) - 1)); + lastPixel = (rightX - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); aaLevel = workBuffer[GWAALevel]; baseShift = workBuffer[GWAAShift]; @@ -3654,7 +3654,7 @@ x = leftX; rampIndex = ds / 65536; /* begin aaFirstPixelFrom:to: */ - firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & (~((workBuffer[GWAALevel]) - 1)); + firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); if (firstPixel1 > rightX) { firstPixel = rightX; goto l1; @@ -3667,7 +3667,7 @@ /* Deal with the first n sub-pixels */ - lastPixel = (rightX - 1) & (~((workBuffer[GWAALevel]) - 1)); + lastPixel = (rightX - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); colorMask = workBuffer[GWAAColorMask]; colorShift = workBuffer[GWAAColorShift]; while ((x < firstPixel) @@ -3996,7 +3996,7 @@ x1 = rightX; } /* begin aaFirstPixelFrom:to: */ - firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & (~((workBuffer[GWAALevel]) - 1)); + firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); if (firstPixel1 > x1) { firstPixel = x1; goto l1; @@ -4009,7 +4009,7 @@ /* Deal with the first n sub-pixels */ - lastPixel = (x1 - 1) & (~((workBuffer[GWAALevel]) - 1)); + lastPixel = (x1 - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); if (x < firstPixel) { colorMask = workBuffer[GWAAColorMask]; colorShift = workBuffer[GWAAColorShift]; @@ -4393,7 +4393,7 @@ lastLength = ((ds / 65536) * (ds / 65536)) + ((dt / 65536) * (dt / 65536)); x = leftX; /* begin aaFirstPixelFrom:to: */ - firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & (~((workBuffer[GWAALevel]) - 1)); + firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); if (firstPixel1 > rightX) { firstPixel = rightX; goto l1; @@ -4406,7 +4406,7 @@ /* Deal with the first n subPixels */ - lastPixel = (rightX - 1) & (~((workBuffer[GWAALevel]) - 1)); + lastPixel = (rightX - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); if ((x < firstPixel) && (lastLength < length2)) { colorMask = workBuffer[GWAAColorMask]; @@ -12541,7 +12541,7 @@ objBuffer[bezier + GBWideExit] = yExit; if ((yEntry >= lineOffset) && (yExit < 0)) { - objBuffer[bezier + GEObjectType] = (((objBuffer[bezier + GEObjectType]) & GEPrimitiveTypeMask) & (~GEEdgeFillsInvalid)); + objBuffer[bezier + GEObjectType] = (((objBuffer[bezier + GEObjectType]) & GEPrimitiveTypeMask) & ((unsigned int)~GEEdgeFillsInvalid)); } else { objBuffer[bezier + GEObjectType] = (((objBuffer[bezier + GEObjectType]) & GEPrimitiveTypeMask) | GEEdgeFillsInvalid); @@ -12630,7 +12630,7 @@ objBuffer[line + GLWideExit] = yExit; if ((yEntry >= lineOffset) && (yExit < 0)) { - objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & (~GEEdgeFillsInvalid)); + objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & ((unsigned int)~GEEdgeFillsInvalid)); } else { objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) | GEEdgeFillsInvalid); @@ -12645,7 +12645,7 @@ lineWidth1 = objBuffer[line + GLWideExtent]; lineOffset1 = lineWidth1 / 2; if (yEntry1 >= lineOffset1) { - objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & (~GEEdgeFillsInvalid)); + objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & ((unsigned int)~GEEdgeFillsInvalid)); } if (yExit1 >= 0) { objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) | GEEdgeFillsInvalid); @@ -12889,7 +12889,7 @@ objBuffer[bezier + GBWideEntry] = yEntry; objBuffer[bezier + GBWideExit] = yExit; if (yEntry >= lineOffset) { - objBuffer[bezier + GEObjectType] = (((objBuffer[bezier + GEObjectType]) & GEPrimitiveTypeMask) & (~GEEdgeFillsInvalid)); + objBuffer[bezier + GEObjectType] = (((objBuffer[bezier + GEObjectType]) & GEPrimitiveTypeMask) & ((unsigned int)~GEEdgeFillsInvalid)); } if (yExit >= 0) { objBuffer[bezier + GEObjectType] = (((objBuffer[bezier + GEObjectType]) & GEPrimitiveTypeMask) | GEEdgeFillsInvalid); @@ -12982,7 +12982,7 @@ lineWidth = objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLWideExtent]; lineOffset = lineWidth / 2; if (yEntry >= lineOffset) { - objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType] = (((objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType]) & GEPrimitiveTypeMask) & (~GEEdgeFillsInvalid)); + objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType] = (((objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType]) & GEPrimitiveTypeMask) & ((unsigned int)~GEEdgeFillsInvalid)); } if (yExit >= 0) { objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType] = (((objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType]) & GEPrimitiveTypeMask) | GEEdgeFillsInvalid); @@ -13036,7 +13036,7 @@ lineWidth = objBuffer[line + GLWideExtent]; lineOffset = lineWidth / 2; if (yEntry >= lineOffset) { - objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & (~GEEdgeFillsInvalid)); + objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & ((unsigned int)~GEEdgeFillsInvalid)); } if (yExit >= 0) { objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) | GEEdgeFillsInvalid); Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a from - BitBltSimulation VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + BitBltSimulation VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a " __DATE__ ; @@ -342,9 +342,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.983 (i)" + "BitBltPlugin VMMaker.oscog-eem.990 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.983 (e)" + "BitBltPlugin VMMaker.oscog-eem.990 (e)" #endif ; static sqInt noHalftone; @@ -501,7 +501,7 @@ blend = ((((((((usqInt) sourcePixVal) >> shift) & rgbMask) * sourceAlpha) + (((((usqInt) destPixVal) >> shift) & rgbMask) * unAlpha)) + 0xFE) / 0xFF) & rgbMask; pixBlend = pixBlend | (blend << shift); } - result = (result & (~(pixMask << ((j - 1) * 16)))) | (pixBlend << ((j - 1) * 16)); + result = (result & ((unsigned int)~(pixMask << ((j - 1) * 16)))) | (pixBlend << ((j - 1) * 16)); } maskShifted = ((usqInt) maskShifted) >> destDepth; sourceShifted = ((usqInt) sourceShifted) >> destDepth; @@ -707,7 +707,7 @@ /* If we have to mix colors then just copy a single word */ destWord = long32At(dstIndex); - destWord = destWord & (~dstMask); + destWord = destWord & ((unsigned int)~dstMask); /* Expand from 16 to 32 bit by adding zero bits */ @@ -751,7 +751,7 @@ /* Toggle between 0 and 16 */ srcShift = srcShift ^ 16; - dstMask = ~dstMask; + dstMask = (unsigned int)~dstMask; } srcY += 1; dstY += 1; @@ -924,7 +924,7 @@ /* begin default8To32Table */ mappingTable = theTable; - mapperFlags = cmFlags & (~ColorMapNewStyle); + mapperFlags = cmFlags & ((unsigned int)~ColorMapNewStyle); /* So we can pre-decrement */ @@ -959,7 +959,7 @@ dstMask = mask2; while (((deltaX -= 1)) != 0) { - sourceWord = ((long32At(srcIndex)) & (~adjust)) + adjust; + sourceWord = ((long32At(srcIndex)) & ((unsigned int)~adjust)) + adjust; srcAlpha = ((usqInt) sourceWord) >> 24; if (srcAlpha > 0x1F) { @@ -970,7 +970,7 @@ /* Everything above 224 is opaque */ destWord = long32At(dstIndex); - destWord = destWord & (~dstMask); + destWord = destWord & ((unsigned int)~dstMask); destWord = ((usqInt) destWord) >> srcShift; destWord = mappingTable[destWord]; sourceWord = alphaBlendScaledwith(sourceWord, destWord); @@ -1037,7 +1037,7 @@ static sqInt bitAndInvertwith(sqInt sourceWord, sqInt destinationWord) { - return sourceWord & (~destinationWord); + return sourceWord & ((unsigned int)~destinationWord); } static sqInt @@ -1049,49 +1049,49 @@ static sqInt bitInvertAndInvertwith(sqInt sourceWord, sqInt destinationWord) { - return (~sourceWord) & (~destinationWord); + return ((unsigned int)~sourceWord) & ((unsigned int)~destinationWord); } static sqInt bitInvertAndwith(sqInt sourceWord, sqInt destinationWord) { - return (~sourceWord) & destinationWord; + return ((unsigned int)~sourceWord) & destinationWord; } static sqInt bitInvertDestinationwith(sqInt sourceWord, sqInt destinationWord) { - return ~destinationWord; + return (unsigned int)~destinationWord; } static sqInt bitInvertOrInvertwith(sqInt sourceWord, sqInt destinationWord) { - return (~sourceWord) | (~destinationWord); + return ((unsigned int)~sourceWord) | ((unsigned int)~destinationWord); } static sqInt bitInvertOrwith(sqInt sourceWord, sqInt destinationWord) { - return (~sourceWord) | destinationWord; + return ((unsigned int)~sourceWord) | destinationWord; } static sqInt bitInvertSourcewith(sqInt sourceWord, sqInt destinationWord) { - return ~sourceWord; + return (unsigned int)~sourceWord; } static sqInt bitInvertXorwith(sqInt sourceWord, sqInt destinationWord) { - return (~sourceWord) ^ destinationWord; + return ((unsigned int)~sourceWord) ^ destinationWord; } static sqInt bitOrInvertwith(sqInt sourceWord, sqInt destinationWord) { - return sourceWord | (~destinationWord); + return sourceWord | ((unsigned int)~destinationWord); } static sqInt @@ -2026,7 +2026,7 @@ } } } - notSkewMask = ~skewMask; + notSkewMask = (unsigned int)~skewMask; if (noHalftone) { halftoneWord = AllOnes; halftoneHeight = 0; @@ -2069,7 +2069,7 @@ prevWord = thisWord; destWord = long32At(destIndex); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord); - destWord = (destMask & mergeWord) | (destWord & (~destMask)); + destWord = (destMask & mergeWord) | (destWord & ((unsigned int)~destMask)); long32Atput(destIndex, destWord); /* This central horizontal loop requires no store masking */ @@ -2154,7 +2154,7 @@ skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew))); destWord = long32At(destIndex); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord); - destWord = (destMask & mergeWord) | (destWord & (~destMask)); + destWord = (destMask & mergeWord) | (destWord & ((unsigned int)~destMask)); long32Atput(destIndex, destWord); destIndex += hInc; } @@ -2192,7 +2192,7 @@ destMask = mask1; destWord = long32At(destIndex); mergeWord = mergeFnwith(halftoneWord, destWord); - destWord = (destMask & mergeWord) | (destWord & (~destMask)); + destWord = (destMask & mergeWord) | (destWord & ((unsigned int)~destMask)); long32Atput(destIndex, destWord); /* This central horizontal loop requires no store masking */ @@ -2227,7 +2227,7 @@ destMask = mask2; destWord = long32At(destIndex); mergeWord = mergeFnwith(halftoneWord, destWord); - destWord = (destMask & mergeWord) | (destWord & (~destMask)); + destWord = (destMask & mergeWord) | (destWord & ((unsigned int)~destMask)); long32Atput(destIndex, destWord); destIndex += 4; } @@ -2288,7 +2288,7 @@ sourcePPW = 32 / sourceDepth; sourcePixMask = maskTable[sourceDepth]; destPixMask = maskTable[destDepth]; - mapperFlags = cmFlags & (~ColorMapNewStyle); + mapperFlags = cmFlags & ((unsigned int)~ColorMapNewStyle); sourceIndex = (sourceBits + (sy * sourcePitch)) + ((sx / sourcePPW) * 4); scrStartBits = sourcePPW - (sx & (sourcePPW - 1)); if (bbW < scrStartBits) { @@ -2449,7 +2449,7 @@ destWord = long32At(destIndex); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord & destMask); - destWord = (destMask & mergeWord) | (destWord & (~destMask)); + destWord = (destMask & mergeWord) | (destWord & ((unsigned int)~destMask)); long32Atput(destIndex, destWord); } destIndex += 4; @@ -4965,7 +4965,7 @@ static sqInt pixMaskwith(sqInt sourceWord, sqInt destinationWord) { - return partitionedANDtonBitsnPartitions(~sourceWord, destinationWord, destDepth, destPPW); + return partitionedANDtonBitsnPartitions((unsigned int)~sourceWord, destinationWord, destDepth, destPPW); } static sqInt @@ -4974,7 +4974,7 @@ if (sourceWord == 0) { return destinationWord; } - return sourceWord | (partitionedANDtonBitsnPartitions(~sourceWord, destinationWord, destDepth, destPPW)); + return sourceWord | (partitionedANDtonBitsnPartitions((unsigned int)~sourceWord, destinationWord, destDepth, destPPW)); } @@ -5793,7 +5793,7 @@ /* If we have to mix colors then just copy a single word */ destWord = long32At(dstIndex); - destWord = destWord & (~dstMask); + destWord = destWord & ((unsigned int)~dstMask); /* Expand from 16 to 32 bit by adding zero bits */ @@ -5836,7 +5836,7 @@ /* Toggle between 0 and 16 */ srcShift = srcShift ^ 16; - dstMask = ~dstMask; + dstMask = (unsigned int)~dstMask; } srcY += 1; dstY += 1; @@ -6104,7 +6104,7 @@ /* begin default8To32Table */ mappingTable = theTable; - mapperFlags = cmFlags & (~ColorMapNewStyle); + mapperFlags = cmFlags & ((unsigned int)~ColorMapNewStyle); /* So we can pre-decrement */ @@ -6139,7 +6139,7 @@ dstMask = mask2; while (((deltaX -= 1)) != 0) { - sourceWord = ((long32At(srcIndex)) & (~adjust)) + adjust; + sourceWord = ((long32At(srcIndex)) & ((unsigned int)~adjust)) + adjust; /* set srcAlpha to the average of the 3 separate aR,Ag,AB values */ @@ -6156,7 +6156,7 @@ sourceWord = 0xFFFFFFFFUL; } destWord = long32At(dstIndex); - destWord = destWord & (~dstMask); + destWord = destWord & ((unsigned int)~dstMask); destWord = ((usqInt) destWord) >> srcShift; destWord = mappingTable[destWord]; sourceWord = rgbComponentAlpha32with(sourceWord, destWord); @@ -6540,7 +6540,7 @@ { sqInt sourceWord; - sourceWord = ~wordToInvert; + sourceWord = (unsigned int)~wordToInvert; if (destDepth < 16) { /* Min each pixel separately */ @@ -7610,7 +7610,7 @@ setupColorMasksFromto(8, cmBitsPerColor); } } - mapperFlags = cmFlags & (~ColorMapNewStyle); + mapperFlags = cmFlags & ((unsigned int)~ColorMapNewStyle); if (destMSB) { dstShiftInc = 0 - destDepth; dstShiftLeft = 32 - destDepth; @@ -7796,7 +7796,7 @@ destWord = long32At(destIndex); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord & destMask); - destWord = (destMask & mergeWord) | (destWord & (~destMask)); + destWord = (destMask & mergeWord) | (destWord & ((unsigned int)~destMask)); long32Atput(destIndex, destWord); } destIndex += 4; Modified: branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c =================================================================== --- branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a from - DSAPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + DSAPlugin VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a */ -static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a " __DATE__ ; @@ -91,9 +91,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims VMMaker.oscog-eem.983 (i)" + "DSAPrims VMMaker.oscog-eem.990 (i)" #else - "DSAPrims VMMaker.oscog-eem.983 (e)" + "DSAPrims VMMaker.oscog-eem.990 (e)" #endif ; static sqInt remainderDigitCount; @@ -561,7 +561,7 @@ d = statePtr[3]; e = statePtr[4]; for (i = 0; i <= 19; i += 1) { - tmp = (((1518500249 + ((b & c) | ((~b) & d))) + ((a << 5) | (((usqInt) a) >> (32 - 5)))) + e) + (bufPtr[i]); + tmp = (((1518500249 + ((b & c) | (((unsigned int)~b) & d))) + ((a << 5) | (((usqInt) a) >> (32 - 5)))) + e) + (bufPtr[i]); e = d; d = c; c = (b << 30) | (((usqInt) b) >> (32 - 30)); Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef + CCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a from - StackToRegisterMappingCogit VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef + StackToRegisterMappingCogit VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef + CCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 from - CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -920,6 +920,7 @@ sqInt falseObject(void); sqInt fetchByteofObject(sqInt byteIndex, sqInt oop); sqInt fetchClassOf(sqInt oop); +static sqInt fetchLong32ofFloatObject(sqInt fieldIndex, sqInt oop) NoDbgRegParms; sqInt fetchLong32ofObject(sqInt fieldIndex, sqInt oop); sqInt fetchPointerofObject(sqInt fieldIndex, sqInt oop); static void finalizeReference(usqInt oop) NoDbgRegParms; @@ -1503,7 +1504,7 @@ jmp_buf reenterInterpreter; /* private export */; sqInt checkAllocFiller; sqInt inIOProcessEvents; -sqInt breakSelectorLength; +sqInt breakSelectorLength = MinSmallInteger; sqInt checkForLeaks; sqInt desiredEdenBytes; sqInt desiredNumStackPages; @@ -2098,7 +2099,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.980"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.991"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17000,7 +17001,7 @@ sqInt maxFramesPerPage; sqInt maxUsedBytesPerPage; - maxUsedBytesPerPage = 512 + ((IFrameSlots + 64) * BytesPerWord); + maxUsedBytesPerPage = (512) + ((IFrameSlots + 64) * BytesPerWord); maxFramesPerPage = (maxUsedBytesPerPage / BytesPerWord) / MFrameSlots; return ((maxFramesPerPage * LargeContextSlots) * BytesPerOop) * GIV(numStackPages); } @@ -19450,7 +19451,7 @@ } } GIV(method) = (GIV(newMethod) = GIV(nilObj)); - breakSelectorLength = MinSmallInteger; + GIV(methodDictLinearSearchLimit) = 8; /* begin flushMethodCache */ for (i = 1; i <= MethodCacheSize; i += 1) { @@ -19511,7 +19512,7 @@ void reportMinimumUnusedHeadroom(void) { - printf("stack page bytes %ld available headroom %ld minimum unused headroom %ld\n", ((long)(stackPageByteSize())), ((long)(((stackPageByteSize()) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))) - ((IFrameSlots + 64) * BytesPerWord))), ((long)(minimumUnusedHeadroom()))); + printf("stack page bytes %ld available headroom %ld minimum unused headroom %ld\n", ((long)(stackPageByteSize())), ((long)(((stackPageByteSize()) - ((((512) < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? (512) : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))) - ((IFrameSlots + 64) * BytesPerWord))), ((long)(minimumUnusedHeadroom()))); } @@ -22670,7 +22671,7 @@ page = stackPageAtpages(index, GIV(pages)); (page->lastAddress = theStackPages + (index * GIV(bytesPerPage))); (page->baseAddress = ((page->lastAddress)) + GIV(bytesPerPage)); - (page->stackLimit = ((page->baseAddress)) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))); + (page->stackLimit = ((page->baseAddress)) - ((((512) < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? (512) : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))); (page->realStackLimit = (page->stackLimit)); (page->baseFP = 0); (page->nextPage = stackPageAt((index == (numPages - 1) @@ -26774,7 +26775,7 @@ rcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); index = longAt(GIV(stackPointer)); if (index == ConstOne) { - result = positive32BitIntegerFor(fetchLong32ofObject((VMBIGENDIAN + result = positive32BitIntegerFor(fetchLong32ofFloatObject((VMBIGENDIAN ? 0 : 1), rcvr)); /* begin pop:thenPush: */ @@ -26783,7 +26784,7 @@ return; } if (index == ConstTwo) { - result = positive32BitIntegerFor(fetchLong32ofObject((VMBIGENDIAN + result = positive32BitIntegerFor(fetchLong32ofFloatObject((VMBIGENDIAN ? 1 : 0), rcvr)); /* begin pop:thenPush: */ @@ -40867,6 +40868,15 @@ } +/* index by word size, and return a pointer as long as the word size */ + +static sqInt +fetchLong32ofFloatObject(sqInt fieldIndex, sqInt oop) +{ + return long32At((oop + BaseHeaderSize) + (fieldIndex << 2)); +} + + /* index by 32-bit units, and return a 32-bit value. Intended to replace fetchWord:ofObject: */ @@ -50283,9 +50293,9 @@ if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { print(" is a free chunk of size "); printNum((longAt(oop)) & AllButTypeMask); + /* begin cr */ printf("\n"); - return; } @@ -51560,10 +51570,11 @@ /* begin printHexnp: */ printf("0x%x", oop); if ((oop & 1)) { - ; if ((oop & 1)) { printf("=%ld\n", (long)integerValueOf(oop)); } + + return; } if (!(((oop & 3) == 0) @@ -52115,7 +52126,7 @@ static sqInt stackLimitBytes(void) { - return ((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))); + return (((512) < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? (512) : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))); } @@ -52151,7 +52162,7 @@ sqInt pageBytes; sqInt smallSize; - pageBytes = (512 + ((IFrameSlots + 64) * BytesPerWord)) + (osCogStackPageHeadroom()); + pageBytes = ((512) + ((IFrameSlots + 64) * BytesPerWord)) + (osCogStackPageHeadroom()); if ((pageBytes & (pageBytes - 1)) == 0) { /* = 0 => a power of two */ Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 */ @@ -273,7 +273,7 @@ /*** Global Variables ***/ char * breakSelector; -sqInt breakSelectorLength; +sqInt breakSelectorLength ; sqInt checkAllocFiller; sqInt checkForLeaks; sqInt deferDisplayUpdates; Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-17 22:30:32 UTC (rev 3190) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 from - CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -923,6 +923,7 @@ sqInt falseObject(void); sqInt fetchByteofObject(sqInt byteIndex, sqInt oop); sqInt fetchClassOf(sqInt oop); +static sqInt fetchLong32ofFloatObject(sqInt fieldIndex, sqInt oop) NoDbgRegParms; sqInt fetchLong32ofObject(sqInt fieldIndex, sqInt oop); sqInt fetchPointerofObject(sqInt fieldIndex, sqInt oop); static void finalizeReference(usqInt oop) NoDbgRegParms; @@ -1506,7 +1507,7 @@ jmp_buf reenterInterpreter; /* private export */; sqInt checkAllocFiller; sqInt inIOProcessEvents; -sqInt breakSelectorLength; +sqInt breakSelectorLength = MinSmallInteger; sqInt checkForLeaks; sqInt desiredEdenBytes; sqInt desiredNumStackPages; @@ -2101,7 +2102,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.980"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.991"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17009,7 +17010,7 @@ sqInt maxFramesPerPage; sqInt maxUsedBytesPerPage; - maxUsedBytesPerPage = 512 + ((IFrameSlots + 64) * BytesPerWord); + maxUsedBytesPerPage = (512) + ((IFrameSlots + 64) * BytesPerWord); maxFramesPerPage = (maxUsedBytesPerPage / BytesPerWord) / MFrameSlots; return ((maxFramesPerPage * LargeContextSlots) * BytesPerOop) * GIV(numStackPages); } @@ -19459,7 +19460,7 @@ } } GIV(method) = (GIV(newMethod) = GIV(nilObj)); - breakSelectorLength = MinSmallInteger; + GIV(methodDictLinearSearchLimit) = 8; /* begin flushMethodCache */ for (i = 1; i <= MethodCacheSize; i += 1) { @@ -19520,7 +19521,7 @@ void reportMinimumUnusedHeadroom(void) { - printf("stack page bytes %ld available headroom %ld minimum unused headroom %ld\n", ((long)(stackPageByteSize())), ((long)(((stackPageByteSize()) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))) - ((IFrameSlots + 64) * BytesPerWord))), ((long)(minimumUnusedHeadroom()))); + printf("stack page bytes %ld available headroom %ld minimum unused headroom %ld\n", ((long)(stackPageByteSize())), ((long)(((stackPageByteSize()) - ((((512) < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? (512) : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))) - ((IFrameSlots + 64) * BytesPerWord))), ((long)(minimumUnusedHeadroom()))); } @@ -22679,7 +22680,7 @@ page = stackPageAtpages(index, GIV(pages)); (page->lastAddress = theStackPages + (index * GIV(bytesPerPage))); (page->baseAddress = ((page->lastAddress)) + GIV(bytesPerPage)); - (page->stackLimit = ((page->baseAddress)) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))); + (page->stackLimit = ((page->baseAddress)) - ((((512) < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? (512) : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))); (page->realStackLimit = (page->stackLimit)); (page->baseFP = 0); (page->nextPage = stackPageAt((index == (numPages - 1) @@ -26783,7 +26784,7 @@ rcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); index = longAt(GIV(stackPointer)); if (index == ConstOne) { - result = positive32BitIntegerFor(fetchLong32ofObject((VMBIGENDIAN + result = positive32BitIntegerFor(fetchLong32ofFloatObject((VMBIGENDIAN ? 0 : 1), rcvr)); /* begin pop:thenPush: */ @@ -26792,7 +26793,7 @@ return; } if (index == ConstTwo) { - result = positive32BitIntegerFor(fetchLong32ofObject((VMBIGENDIAN + result = positive32BitIntegerFor(fetchLong32ofFloatObject((VMBIGENDIAN ? 1 : 0), rcvr)); /* begin pop:thenPush: */ @@ -40876,6 +40877,15 @@ } +/* index by word size, and return a pointer as long as the word size */ + +static sqInt +fetchLong32ofFloatObject(sqInt fieldIndex, sqInt oop) +{ + return long32At((oop + BaseHeaderSize) + (fieldIndex << 2)); +} + + /* index by 32-bit units, and return a 32-bit value. Intended to replace fetchWord:ofObject: */ @@ -50292,9 +50302,9 @@ if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { print(" is a free chunk of size "); printNum((longAt(oop)) & AllButTypeMask); + /* begin cr */ printf("\n"); - return; } @@ -51569,10 +51579,11 @@ /* begin printHexnp: */ printf("0x%x", oop); if ((oop & 1)) { - ; if ((oop & 1)) { printf("=%ld\n", (long)integerValueOf(oop)); } + + return; } if (!(((oop & 3) == 0) @@ -52124,7 +52135,7 @@ static sqInt stackLimitBytes(void) { - return ((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))); + return (((512) < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? (512) : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))); } @@ -52160,7 +52171,7 @@ sqInt pageBytes; sqInt smallSize; - pageBytes = (512 + ((IFrameSlots + 64) * BytesPerWord)) + (osCogStackPageHeadroom()); + pageBytes = ((512) + ((IFrameSlots + 64) * BytesPerWord)) + (osCogStackPageHeadroom()); if ((pageBytes & (pageBytes - 1)) == 0) { /* = 0 => a power of two */ Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef + CCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a from - StackToRegisterMappingCogit VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef + StackToRegisterMappingCogit VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef + CCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-12-17 02:34:06 UTC (rev 3189) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-12-17 22:30:32 UTC (rev 3190) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 from - CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 + CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.991 uuid: 368647af-b954-4bf5-a526-3f83badb3361 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -820,6 +820,7 @@ static usqInt bytesInObject(sqInt objOop) NoDbgRegParms; static sqInt changeClassOfto(sqInt rcvr, sqInt argClass) NoDbgRegParms; static double dbgFloatValueOf(sqInt oop) NoDbgRegParms; +static sqInt fetchLong32ofFloatObject(sqInt fieldIndex, sqInt oop) NoDbgRegParms; sqInt floatObjectOf(double aFloat); double floatValueOf(sqInt oop); static sqInt initFreeChunkWithBytesat(usqLong numBytes, sqInt address) NoDbgRegParms; @@ -1124,6 +1125,7 @@ void printFreeChunks(void); void printFreeChunk(sqInt freeChunk); static void printFreeChunkisNextChunk(sqInt freeChunk, sqInt isNextChunk) NoDbgRegParms; +void printFreeListHeads(void); void printFreeList(sqInt chunkOrIndex); void printFreeTree(void); static void printFreeTreeChunk(sqInt chunkOrZero) NoDbgRegParms; @@ -1552,8 +1554,8 @@ _iss sqInt traceLogIndex; _iss usqInt scavengeThreshold; _iss sqInt remapBufferCount; +_iss sqInt * freeLists; _iss char * stackLimit; -_iss sqInt * freeLists; _iss sqInt rememberedSetSize; _iss sqInt tempOop; _iss sqInt * rememberedSet; @@ -1726,7 +1728,7 @@ sqInt checkForLeaks; sqInt checkAllocFiller; sqInt inIOProcessEvents; -sqInt breakSelectorLength; +sqInt breakSelectorLength = MinSmallInteger; sqInt desiredEdenBytes; sqInt desiredNumStackPages; sqInt extraVMMemory; @@ -2348,7 +2350,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.986"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.991"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18612,7 +18614,7 @@ sqInt maxFramesPerPage; sqInt maxUsedBytesPerPage; - maxUsedBytesPerPage = 512 + ((IFrameSlots + 64) * BytesPerWord); + maxUsedBytesPerPage = (512) + ((IFrameSlots + 64) * BytesPerWord); maxFramesPerPage = (maxUsedBytesPerPage / BytesPerWord) / MFrameSlots; return ((maxFramesPerPage * LargeContextSlots) * BytesPerOop) * GIV(numStackPages); } @@ -23858,7 +23860,7 @@ } } GIV(method) = (GIV(newMethod) = GIV(nilObj)); - breakSelectorLength = MinSmallInteger; + GIV(methodDictLinearSearchLimit) = 8; /* begin flushMethodCache */ for (i = 1; i <= MethodCacheSize; i += 1) { @@ -23919,7 +23921,7 @@ void reportMinimumUnusedHeadroom(void) { - printf("stack page bytes %ld available headroom %ld minimum unused headroom %ld\n", ((long)(stackPageByteSize())), ((long)(((stackPageByteSize()) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))) - ((IFrameSlots + 64) * BytesPerWord))), ((long)(minimumUnusedHeadroom()))); + printf("stack page bytes %ld available headroom %ld minimum unused headroom %ld\n", ((long)(stackPageByteSize())), ((long)(((stackPageByteSize()) - ((((512) < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? (512) : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))) - ((IFrameSlots + 64) * BytesPerWord))), ((long)(minimumUnusedHeadroom()))); } @@ -27500,7 +27502,7 @@ page = stackPageAtpages(index, GIV(pages)); (page->lastAddress = theStackPages + (index * GIV(bytesPerPage))); (page->baseAddress = ((page->lastAddress)) + GIV(bytesPerPage)); - (page->stackLimit = ((page->baseAddress)) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))); + (page->stackLimit = ((page->baseAddress)) - ((((512) < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? (512) : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))); (page->realStackLimit = (page->stackLimit)); (page->baseFP = 0); (page->nextPage = stackPageAt((index == (numPages - 1) @@ -31819,7 +31821,7 @@ rcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); index = longAt(GIV(stackPointer)); if (index == ConstOne) { - result = positive32BitIntegerFor(fetchLong32ofObject((VMBIGENDIAN + result = positive32BitIntegerFor(fetchLong32ofFloatObject((VMBIGENDIAN ? 0 : 1), rcvr)); /* begin pop:thenPush: */ @@ -31828,7 +31830,7 @@ return; } if (index == ConstTwo) { - result = positive32BitIntegerFor(fetchLong32ofObject((VMBIGENDIAN + result = positive32BitIntegerFor(fetchLong32ofFloatObject((VMBIGENDIAN ? 1 : 0), rcvr)); /* begin pop:thenPush: */ @@ -31981,6 +31983,7 @@ double arg; sqInt isFloat; sqInt isFloat1; + sqInt oop; double rcvr; sqInt rcvrOop; double result; @@ -32016,11 +32019,12 @@ goto l2; } /* begin floatValueOf: */ - isFloat1 = (((longAt(GIV(stackPointer))) & 3) == 0) - && (((longAt(longAt(GIV(stackPointer)))) & 0x3FFFFF) == ClassFloatCompactIndex); + oop = longAt(GIV(stackPointer)); + isFloat1 = ((oop & 3) == 0) + && (((longAt(oop)) & 0x3FFFFF) == ClassFloatCompactIndex); if (isFloat1) { ; - fetchFloatAtinto((longAt(GIV(stackPointer))) + BaseHeaderSize, result1); + fetchFloatAtinto(oop + BaseHeaderSize, result1); arg = result1; goto l4; } @@ -32048,6 +32052,7 @@ double arg; sqInt isFloat; sqInt isFloat1; + sqInt oop; double rcvr; sqInt rcvrOop; double result; @@ -32083,11 +32088,12 @@ goto l2; } /* begin floatValueOf: */ - isFloat1 = (((longAt(GIV(stackPointer))) & 3) == 0) - && (((longAt(longAt(GIV(stackPointer)))) & 0x3FFFFF) == ClassFloatCompactIndex); + oop = longAt(GIV(stackPointer)); + isFloat1 = ((oop & 3) == 0) + && (((longAt(oop)) & 0x3FFFFF) == ClassFloatCompactIndex); if (isFloat1) { ; - fetchFloatAtinto((longAt(GIV(stackPointer))) + BaseHeaderSize, result1); + fetchFloatAtinto(oop + BaseHeaderSize, result1); arg = result1; goto l4; } @@ -32115,6 +32121,7 @@ double arg; sqInt isFloat; sqInt isFloat1; + sqInt oop; double rcvr; sqInt rcvrOop; double result; @@ -32150,11 +32157,12 @@ goto l2; } /* begin floatValueOf: */ - isFloat1 = (((longAt(GIV(stackPointer))) & 3) == 0) - && (((longAt(longAt(GIV(stackPointer)))) & 0x3FFFFF) == ClassFloatCompactIndex); + oop = longAt(GIV(stackPointer)); + isFloat1 = ((oop & 3) == 0) + && (((longAt(oop)) & 0x3FFFFF) == ClassFloatCompactIndex); if (isFloat1) { ; - fetchFloatAtinto((longAt(GIV(stackPointer))) + BaseHeaderSize, result1); + fetchFloatAtinto(oop + BaseHeaderSize, result1); arg = result1; goto l4; } @@ -32182,6 +32190,7 @@ double arg; sqInt isFloat; sqInt isFloat1; + sqInt oop; double rcvr; sqInt rcvrOop; double result; @@ -32217,11 +32226,12 @@ goto l2; } /* begin floatValueOf: */ - isFloat1 = (((longAt(GIV(stackPointer))) & 3) == 0) - && (((longAt(longAt(GIV(stackPointer)))) & 0x3FFFFF) == ClassFloatCompactIndex); + oop = longAt(GIV(stackPointer)); + isFloat1 = ((oop & 3) == 0) + && (((longAt(oop)) & 0x3FFFFF) == ClassFloatCompactIndex); if (isFloat1) { ; - fetchFloatAtinto((longAt(GIV(stackPointer))) + BaseHeaderSize, result1); + fetchFloatAtinto(oop + BaseHeaderSize, result1); arg = result1; goto l4; } @@ -32249,6 +32259,7 @@ double arg; sqInt isFloat; sqInt isFloat1; + sqInt oop; double rcvr; sqInt rcvrOop; double result; @@ -32284,11 +32295,12 @@ goto l2; } /* begin floatValueOf: */ - isFloat1 = (((longAt(GIV(stackPointer))) & 3) == 0) - && (((longAt(longAt(GIV(stackPointer)))) & 0x3FFFFF) == ClassFloatCompactIndex); + oop = longAt(GIV(stackPointer)); + isFloat1 = ((oop & 3) == 0) + && (((longAt(oop)) & 0x3FFFFF) == ClassFloatCompactIndex); if (isFloat1) { ; - fetchFloatAtinto((longAt(GIV(stackPointer))) + BaseHeaderSize, result1); + fetchFloatAtinto(oop + BaseHeaderSize, result1); arg = result1; goto l4; } @@ -32381,6 +32393,7 @@ double arg; sqInt isFloat; sqInt isFloat1; + sqInt oop; double rcvr; sqInt rcvrOop; double result; @@ -32416,11 +32429,12 @@ goto l2; } /* begin floatValueOf: */ - isFloat1 = (((longAt(GIV(stackPointer))) & 3) == 0) - && (((longAt(longAt(GIV(stackPointer)))) & 0x3FFFFF) == ClassFloatCompactIndex); + oop = longAt(GIV(stackPointer)); + isFloat1 = ((oop & 3) == 0) + && (((longAt(oop)) & 0x3FFFFF) == ClassFloatCompactIndex); if (isFloat1) { ; - fetchFloatAtinto((longAt(GIV(stackPointer))) + BaseHeaderSize, result1); + fetchFloatAtinto(oop + BaseHeaderSize, result1); arg = result1; goto l4; } @@ -36254,7 +36268,7 @@ flag("endianness"); longAtput(obj, (boolean == GIV(trueObj) ? (longAt(obj)) | (1 << 30) - : (longAt(obj)) & (~(1 << 30)))); + : (longAt(obj)) & ((unsigned int)~(1 << 30)))); } else { wasPinned = GIV(falseObj); @@ -40805,7 +40819,7 @@ assert(((classIndex >= 0) && (classIndex <= (classIndexMask())))); assert(((newFormat >= 0) && (newFormat <= (formatMask())))); flag("endianness"); - longAtput(rcvr, ((longAt(rcvr)) & (~((0x1F << 24) + 0x3FFFFF))) + (classIndex + (newFormat << 24))); + longAtput(rcvr, ((longAt(rcvr)) & ((unsigned int)~((0x1F << 24) + 0x3FFFFF))) + (classIndex + (newFormat << 24))); return 0; } @@ -40829,6 +40843,15 @@ return 0.0; } + +/* index by word size, and return a pointer as long as the word size */ + +static sqInt +fetchLong32ofFloatObject(sqInt fieldIndex, sqInt oop) +{ + return long32At((oop + BaseHeaderSize) + (fieldIndex << 2)); +} + sqInt @@ Diff output truncated at 50000 characters. @@

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2014