Vm-dev April 2016

vm-dev@lists.squeakfoundation.org

35 participants
202 discussions

VM Maker: VMMaker.oscog-cb.1760.mcz
by commits＠source.squeak.org 05 Apr '16

05 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1760.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1760 Author: cb Time: 5 April 2016, 7:53:15.885 am UUID: e69b6e48-5451-499c-a8b9-4e9710c19b2b Ancestors: VMMaker.oscog-cb.1759 and: / or: do not generate counters any more (Remove lots of overhead in many benchmarks such as Richard). fix extension on branches in the SistaCogit. =============== Diff against VMMaker.oscog-cb.1759 =============== Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) so that scanning for send and branch data is simplified and that branch data is correct." <inline: false> + | ok counterAddress countTripped retry nextDescriptor nextPC | - | ok counterAddress countTripped retry | <var: #ok type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> + <var: #nextDescriptor type: #'AbstractInstruction *'> (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. branchReachedOnlyForCounterTrip ifTrue: [ branchReachedOnlyForCounterTrip := false. ^ self genCounterTripOnlyJumpIf: boolean to: targetBytecodePC ]. + + boolean ifFalse: + [ "detection of and: / or:" + nextPC := bytecodePC + (self generatorAt: byte0) numBytes. + nextDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + bytecodeSetOffset. + nextDescriptor generator == #genPushConstantTrueBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. + nextDescriptor := self generatorAt: (objectMemory fetchByte: targetBytecodePC ofObject: methodObj) + bytecodeSetOffset. + nextDescriptor generator == #genPushConstantFalseBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. ]. + extA := 0. "reset it, we don't care if MBB not needed as we need the trampoline anyway" + self ssFlushTo: simStackPtr - 1. self ssTop popToReg: TempReg. self ssPop: 1. "We need SendNumArgsReg because of the mustBeBooleanTrampoline" self ssAllocateRequiredReg: SendNumArgsReg. retry := self Label. self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: SendNumArgsReg. counterIndex := counterIndex + 1. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self genFallsThroughCountLogicCounterReg: SendNumArgsReg counterAddress: counterAddress. self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if counterReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline will return directly to machine code, returning the boolean. So the code should jump back to the retry point. The trampoline makes sure that TempReg has been reloaded." self annotateBytecode: self Label. self Jump: retry. ok jmpTarget: self Label. ^0!

1 0

squeakvm.org seems down
by Nicolas Cellier 05 Apr '16

05 Apr '16

Hi, it looks like it's not just me http://www.downforeveryoneorjustme.com/http://squeakvm.org ...

4 7

Re: CogVM | Granularity of process switching/interruption
by Marcel Taeumel 05 Apr '16

05 Apr '16

Hi Eliot, thank you for this comprehensive answer. Sure, I just CC'ed vm-dev. No concrete example/worries. I am just brainstorming about the general possibilities/limitations of user interfaces (and application frameworks) in Squeak. :-) Best, Marcel Am 05.04.2016 08:33:57 schrieb Eliot Miranda <eliot.miranda(a)gmail.com>: Hi Marcel, On Apr 4, 2016, at 6:24 AM, Marcel Taeumel <marcel.taeumel(a)hpi.de [mailto:marcel.taeumel@hpi.de]> wrote: Hi Eliot, is it still (roughly) at the granularity of message sends where processes will be interrupted? The suspension points are - the first bytecode in a non-primitive method - the first bytecode in a primitive method (after the callPrimitive bytecode) if the primitive fails - a backward branch - the first bytecode of a block (unless invoked with valueNoContextSwitch[:] That is a maximal set of suspension points. If the JIT can compile a method or block without needing a frame (because the code is simple, eg doesn't do a send) then there will be no suspension point in that method when jitted. Hence, the worst that can happen is that Squeak's debugger shows up and complains about some DNU based on corrupted state? (Or that the app runs a while until some debugger shows up...) The potential failures are - MNU - mustBeBoolean - cannotReturn: - cannotResume: - illegalBytecodeAt: and with read-only object support - attemptToAssign:withIndex: Meaning: The VM will never crash by bad multi-programming? Hmmm. Not sure whether that's true because one could possibly create synthetic examples that crash the VM and then try and provoke these by "bad multi-programming". But I think you're right. The VM doesn't suspend at arbitrary points. But perhaps you could express what you're worried about. Any examples? And this is a discussion we could have on vm-dev...no? Best, Marcel Best, Eliot _,,,^..^,,,_ (phone)

1 0

VM Maker: VMMaker.oscog-cb.1759.mcz
by commits＠source.squeak.org 05 Apr '16

05 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1759.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1759 Author: cb Time: 4 April 2016, 7:13:25.535 pm UUID: 050913c6-bc84-4445-a1b6-fd0380dfb596 Ancestors: VMMaker.oscog-nice.1758 Added support in the JIT for: - mustbeboolean flag no generating the mustBeBoolean trampoline if the optimizer can prove it does not happen. - storecheck flag avoiding the storeCheck if the optimizer can prove the value to store is an immediate, nil, true or false. - remote temporary bytecode allowing remote inst var access in the SistaV1 bytecode set. =============== Diff against VMMaker.oscog-nice.1758 =============== Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "SimpleStackBasedCogit initializeBytecodeTableForSistaV1" BytecodeSetHasDirectedSuperSend := true. FirstSpecialSelector := 96. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode) (1 76 76 genPushReceiverBytecode) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 117 genSpecialSelectorSend isMapped) "#+ #- #< #> #<= #>= #= #~= #* #/ #\\ #@ #bitShift: #// #bitAnd: #bitOr: #at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) "stores" (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) (1 217 217 genUnconditionalTrapBytecode isMapped) (1 218 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access" (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 genPushClosureTempsBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 unknownBytecode) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 241 241 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 244 244 genExtStoreLiteralVariableBytecode isMappedIfImmutability) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 unknownBytecode) "reserved for Push Float" (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) + (3 251 251 genPushRemoteTempOrRemoteInstVarLongBytecode) + (3 252 252 genStoreRemoteTempOrRemoteInstVarLongBytecode) + (3 253 253 genStoreAndPopRemoteTempOrRemoteInstVarLongBytecode) - (3 251 251 genPushRemoteTempLongBytecode) - (3 252 252 genStoreRemoteTempLongBytecode) - (3 253 253 genStoreAndPopRemoteTempLongBytecode) (3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode) (3 255 255 unknownBytecode))! Item was added: + ----- Method: SimpleStackBasedCogit>>genPushRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genPushRemoteInstVarLongBytecode + self MoveMw: (self frameOffsetOfTemporary: byte2 - (1 << 7)) r: FPReg R: ClassReg. + objectRepresentation + genEnsureOopInRegNotForwarded: ClassReg + scratchReg: TempReg. + objectRepresentation + genLoadSlot: byte1 + sourceReg: ClassReg + destReg: TempReg. + self PushR: TempReg. + ^0! Item was added: + ----- Method: SimpleStackBasedCogit>>genPushRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genPushRemoteTempOrRemoteInstVarLongBytecode + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genPushRemoteTempLongBytecode ] + ifFalse: [ self genPushRemoteInstVarLongBytecode ]! Item was added: + ----- Method: SimpleStackBasedCogit>>genStoreAndPopRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genStoreAndPopRemoteTempOrRemoteInstVarLongBytecode + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genStorePop: true RemoteTemp: byte1 At: byte2 ] + ifFalse: [ self genStorePop: true RemoteInstVar: byte1 At: byte2 - (1 << 7) ]! Item was added: + ----- Method: SimpleStackBasedCogit>>genStorePop:RemoteInstVar:At: (in category 'bytecode generator support') ----- + genStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex + <inline: false> + "The only reason we assert needsFrame here is that in a frameless method + ReceiverResultReg must and does contain only self, but the ceStoreCheck + trampoline expects the target of the store to be in ReceiverResultReg. So + in a frameless method we would have a conflict between the receiver and + the temote temp store, unless we we smart enough to realise that + ReceiverResultReg was unused after the literal variable store, unlikely given + that methods return self by default." + self assert: needsFrame. + popBoolean + ifTrue: [self PopR: ClassReg] + ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. + self MoveMw: (self frameOffsetOfTemporary: objectIndex) r: FPReg R: ReceiverResultReg. + objectRepresentation + genEnsureOopInRegNotForwarded: ReceiverResultReg + scratchReg: TempReg. + ^objectRepresentation + genStoreSourceReg: ClassReg + slotIndex: slotIndex + destReg: ReceiverResultReg + scratchReg: TempReg + inFrame: needsFrame! Item was added: + ----- Method: SimpleStackBasedCogit>>genStoreRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genStoreRemoteTempOrRemoteInstVarLongBytecode + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genStorePop: false RemoteTemp: byte1 At: byte2 ] + ifFalse: [ self genStorePop: false RemoteInstVar: byte1 At: byte2 - (1 << 7) ]! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "StackToRegisterMappingCogit initializeBytecodeTableForSistaV1" numPushNilsFunction := #sistaV1:Num:Push:Nils:. pushNilSizeFunction := #sistaV1PushNilSize:numInitialNils:. BytecodeSetHasDirectedSuperSend := true. FirstSpecialSelector := 96. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef needsFrameNever: 1) (1 16 31 genPushLitVarDirSup16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 96 genSpecialSelectorArithmetic isMapped AddRR) (1 97 97 genSpecialSelectorArithmetic isMapped SubRR) (1 98 98 genSpecialSelectorComparison isMapped JumpLess) (1 99 99 genSpecialSelectorComparison isMapped JumpGreater) (1 100 100 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 101 101 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 102 102 genSpecialSelectorComparison isMapped JumpZero) (1 103 103 genSpecialSelectorComparison isMapped JumpNonZero) (1 104 109 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 110 110 genSpecialSelectorArithmetic isMapped AndRR) (1 111 111 genSpecialSelectorArithmetic isMapped OrRR) (1 112 117 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) (1 217 217 genUnconditionalTrapBytecode isMapped) (1 218 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access" (2 227 227 genExtPushLitVarDirSupBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 genPushClosureTempsBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 unknownBytecode) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 241 241 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 244 244 genExtStoreLiteralVariableBytecode isMappedIfImmutability) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 unknownBytecode) "reserved for Push Float" (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) + (3 251 251 genPushRemoteTempOrRemoteInstVarLongBytecode) + (3 252 252 genStoreRemoteTempOrRemoteInstVarLongBytecode) + (3 253 253 genStoreAndPopRemoteTempOrRemoteInstVarLongBytecode) - (3 251 251 genPushRemoteTempLongBytecode) - (3 252 252 genStoreRemoteTempLongBytecode) - (3 253 253 genStoreAndPopRemoteTempLongBytecode) (3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode branch v4:Long:BranchIfNotInstanceOf:Distance:) (3 255 255 unknownBytecode))! Item was changed: ----- Method: StackToRegisterMappingCogit>>genImmutabilityCheckStorePop:LiteralVariable: (in category 'bytecode generator support') ----- genImmutabilityCheckStorePop: popBoolean LiteralVariable: litVarIndex <inline: true> | association needStoreCheck | "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the literal store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." self assert: needsFrame. "N.B. No need to check the stack for references because we generate code for literal variable loads that stores the result in a register, deferring only the register push." + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. association := self getLiteral: litVarIndex. optStatus isReceiverResultRegLive: false. self ssAllocateRequiredReg: ReceiverResultReg. "for store trampoline call in genStoreSourceReg: has to be ReceiverResultReg" self genMoveConstant: association R: ReceiverResultReg. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg. self ssAllocateRequiredReg: ClassReg. self ssStoreAndReplacePop: popBoolean toReg: ClassReg. self ssFlushTo: simStackPtr. objectRepresentation genStoreWithImmutabilityCheckSourceReg: ClassReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg needsStoreCheck: needStoreCheck needRestoreRcvr: false. ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genImmutabilityCheckStorePop:MaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genImmutabilityCheckStorePop: popBoolean MaybeContextReceiverVariable: slotIndex <inline: true> | jmpSingle jmpDone needStoreCheck | <var: #jmpSingle type: #'AbstractInstruction *'> <var: #jmpDone type: #'AbstractInstruction *'> "The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame." self assert: needsFrame. + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. "Note that ReceiverResultReg remains live after both ceStoreContextInstVarTrampoline and ceStoreCheckTrampoline." self ensureReceiverResultRegContainsSelf. self ssPop: 1. self ssAllocateCallReg: ClassReg and: SendNumArgsReg. "for ceStoreContextInstVarTrampoline" self ssPush: 1. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. self ssStoreAndReplacePop: popBoolean toReg: ClassReg. "stack is flushed except maybe ssTop if popBoolean is false. ssTop is a SSregister in this case due to #ssStoreAndReplacePop: to avoid a second indirect read / annotation in case of SSConstant or SSBaseRegister" self ssFlushTo: simStackPtr. jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceStoreContextInstVarTrampoline. jmpDone := self Jump: 0. jmpSingle jmpTarget: self Label. objectRepresentation genStoreWithImmutabilityCheckSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg needsStoreCheck: needStoreCheck needRestoreRcvr: true. jmpDone jmpTarget: self Label. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genImmutabilityCheckStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- genImmutabilityCheckStorePop: popBoolean ReceiverVariable: slotIndex <inline: true> | needStoreCheck | self assert: needsFrame. + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. "Note that ReceiverResultReg remains live after the trampoline." self ensureReceiverResultRegContainsSelf. self ssAllocateRequiredReg: ClassReg. self ssStoreAndReplacePop: popBoolean toReg: ClassReg. self ssFlushTo: simStackPtr. objectRepresentation genStoreWithImmutabilityCheckSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg needsStoreCheck: needStoreCheck needRestoreRcvr: true. ^ 0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genImmutabilityCheckStorePop:RemoteInstVar:At: (in category 'bytecode generator support') ----- + genImmutabilityCheckStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex + <inline: true> + | needStoreCheck | + self assert: needsFrame. + needStoreCheck := self ssTopNeedsStoreCheck. + + self ssAllocateRequiredReg: ReceiverResultReg. + optStatus isReceiverResultRegLive: false. + self MoveMw: (self frameOffsetOfTemporary: objectIndex) r: FPReg R: ReceiverResultReg. + + self ssAllocateRequiredReg: ClassReg. + self ssStoreAndReplacePop: popBoolean toReg: ClassReg. + self ssFlushTo: simStackPtr. + + objectRepresentation + genEnsureOopInRegNotForwarded: ReceiverResultReg + scratchReg: TempReg. + + objectRepresentation + genStoreWithImmutabilityCheckSourceReg: ClassReg + slotIndex: slotIndex + destReg: ReceiverResultReg + scratchReg: TempReg + needsStoreCheck: needStoreCheck + needRestoreRcvr: false. + ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC <inline: false> | desc fixup ok | <var: #desc type: #'CogSimStackEntry *'> <var: #fixup type: #'BytecodeFixup *'> <var: #ok type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. (desc type == SSConstant and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: ["Must arrange there's a fixup at the target whether it is jumped to or not so that the simStackPtr can be kept correct." fixup := self ensureFixupAt: targetBytecodePC - initialPC. "Must enter any annotatedConstants into the map" desc annotateUse ifTrue: [self annotateBytecode: (self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label])]. "Must annotate the bytecode for correct pc mapping." self annotateBytecode: (desc constant = boolean ifTrue: [self Jump: fixup] ifFalse: [self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label]]). ^0]. desc popToReg: TempReg. + "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). + + extA = 1 ifTrue: [ extA := 0. ^ 0 ]. + extA := 0. + self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). ok jmpTarget: (self annotateBytecode: self Label). ^0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genPushRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genPushRemoteInstVarLongBytecode + | tempVectReg remoteTempReg | + tempVectReg := self allocateRegNotConflictingWith: 0. + self MoveMw: (self frameOffsetOfTemporary: byte2 - (1 << 7)) r: FPReg R: tempVectReg. + objectRepresentation + genEnsureOopInRegNotForwarded: tempVectReg + scratchReg: TempReg. + remoteTempReg := self availableRegOrNoneNotConflictingWith: (self registerMaskFor: tempVectReg). + remoteTempReg = NoReg ifTrue: [remoteTempReg := tempVectReg]. + objectRepresentation + genLoadSlot: byte1 + sourceReg: tempVectReg + destReg: remoteTempReg. + ^self ssPushRegister: remoteTempReg! Item was added: + ----- Method: StackToRegisterMappingCogit>>genStorePop:RemoteInstVar:At: (in category 'bytecode generator support') ----- + genStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex + <inline: false> + self + cppIf: IMMUTABILITY + ifTrue: [ ^ self genImmutabilityCheckStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex ] + ifFalse: [ ^ self genVanillaStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex ] + ! Item was changed: ----- Method: StackToRegisterMappingCogit>>genVanillaStorePop:LiteralVariable: (in category 'bytecode generator support') ----- genVanillaStorePop: popBoolean LiteralVariable: litVarIndex <inline: true> | topReg association needStoreCheck | "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the literal store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." self assert: needsFrame. "N.B. No need to check the stack for references because we generate code for literal variable loads that stores the result in a register, deferring only the register push." + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. association := self getLiteral: litVarIndex. optStatus isReceiverResultRegLive: false. self ssAllocateRequiredReg: ReceiverResultReg. "for ceStoreCheck call in genStoreSourceReg: has to be ReceiverResultReg" self genMoveConstant: association R: ReceiverResultReg. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg. topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). self ssStorePop: popBoolean toReg: topReg. objectRepresentation genStoreSourceReg: topReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame needsStoreCheck: needStoreCheck. ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genVanillaStorePop:MaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genVanillaStorePop: popBoolean MaybeContextReceiverVariable: slotIndex <inline: true> | jmpSingle jmpDone needStoreCheck | <var: #jmpSingle type: #'AbstractInstruction *'> <var: #jmpDone type: #'AbstractInstruction *'> "The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame." self assert: needsFrame. self ssFlushUpThroughReceiverVariable: slotIndex. + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. "Note that ReceiverResultReg remains live after both ceStoreContextInstVarTrampoline and ceStoreCheckTrampoline." self ensureReceiverResultRegContainsSelf. self ssPop: 1. self ssAllocateCallReg: ClassReg and: SendNumArgsReg. "for ceStoreContextInstVarTrampoline" self ssPush: 1. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. self ssStorePop: popBoolean toReg: ClassReg. jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceStoreContextInstVarTrampoline. jmpDone := self Jump: 0. jmpSingle jmpTarget: self Label. objectRepresentation genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: true needsStoreCheck: needStoreCheck. jmpDone jmpTarget: self Label. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genVanillaStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- genVanillaStorePop: popBoolean ReceiverVariable: slotIndex <inline: true> | topReg needStoreCheck | self ssFlushUpThroughReceiverVariable: slotIndex. + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. "Note that ReceiverResultReg remains live after ceStoreCheckTrampoline." self ensureReceiverResultRegContainsSelf. topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). self ssStorePop: popBoolean toReg: topReg. objectRepresentation genStoreSourceReg: topReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame needsStoreCheck: needStoreCheck. ^ 0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genVanillaStorePop:RemoteInstVar:At: (in category 'bytecode generator support') ----- + genVanillaStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex + <inline: false> + | topReg needStoreCheck | + "The only reason we assert needsFrame here is that in a frameless method + ReceiverResultReg must and does contain only self, but the ceStoreCheck + trampoline expects the target of the store to be in ReceiverResultReg. So + in a frameless method we would have a conflict between the receiver and + the temote temp store, unless we we smart enough to realise that + ReceiverResultReg was unused after the literal variable store, unlikely given + that methods return self by default." + self assert: needsFrame. + "N.B. No need to check the stack for references because we generate code for + remote temp loads that stores the result in a register, deferring only the register push." + needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. + topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). + self ssAllocateRequiredReg: ReceiverResultReg. + optStatus isReceiverResultRegLive: false. + self ssStorePop: popBoolean toReg: topReg. + self MoveMw: (self frameOffsetOfTemporary: objectIndex) r: FPReg R: ReceiverResultReg. + objectRepresentation + genEnsureOopInRegNotForwarded: ReceiverResultReg + scratchReg: TempReg. + ^objectRepresentation + genStoreSourceReg: topReg + slotIndex: slotIndex + destReg: ReceiverResultReg + scratchReg: TempReg + inFrame: needsFrame + needsStoreCheck: needStoreCheck! Item was added: + ----- Method: StackToRegisterMappingCogit>>ssTopNeedsStoreCheck (in category 'bytecode generator support') ----- + ssTopNeedsStoreCheck + <inline: true> + | needsStoreCheck | + needsStoreCheck := (extB noMask: 1) and: [ (objectRepresentation isUnannotatableConstant: self ssTop) not ]. + extB := 0. + ^ needsStoreCheck!

1 0

VM Maker: BytecodeSets.spur-cb.41.mcz
by commits＠source.squeak.org 05 Apr '16

05 Apr '16

Eliot Miranda uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-cb.41.mcz ==================== Summary ==================== Name: BytecodeSets.spur-cb.41 Author: cb Time: 4 April 2016, 6:20:45.399 pm UUID: d61f7d7f-e207-48aa-b772-b78032fc6810 Ancestors: BytecodeSets.spur-rmacnak.40 Added support for multiple new bytecode instructions, especially the new full block closure bytecode. =============== Diff against BytecodeSets.spur-rmacnak.40 =============== Item was changed: BytecodeEncoder subclass: #EncoderForSistaV1 (excessive size, no diff calculated) Item was changed: + ----- Method: EncoderForSistaV1>>genBranchIfNotInstanceOf:distance: (in category 'extended bytecode generation') ----- - ----- Method: EncoderForSistaV1>>genBranchIfNotInstanceOf:distance: (in category 'bytecode generation') ----- genBranchIfNotInstanceOf: literalIndex distance: distance "254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" | extendedIndex extendedDistance | (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65536]. (distance < 1 or: [distance > 32767]) ifTrue: [^self outOfRangeError: 'distance' index: distance range: 0 to: 32767]. (extendedIndex := literalIndex) > 255 ifTrue: [self genUnsignedSingleExtendA: extendedIndex // 256. extendedIndex := extendedIndex \\ 256]. (extendedDistance := distance) > 255 ifTrue: [self genUnsignedSingleExtendB: (distance bitShift: -8). extendedDistance := distance bitAnd: 255]. stream nextPut: 254; nextPut: extendedIndex; nextPut: extendedDistance! Item was added: + ----- Method: EncoderForSistaV1>>genBranchPopFalseNoMustBeBoolean: (in category 'extended bytecode generation') ----- + genBranchPopFalseNoMustBeBoolean: distance + self genNoMustBeBooleanFlag. + self genBranchPopFalseLong: distance! Item was added: + ----- Method: EncoderForSistaV1>>genBranchPopTrueNoMustBeBoolean: (in category 'extended bytecode generation') ----- + genBranchPopTrueNoMustBeBoolean: distance + self genNoMustBeBooleanFlag. + self genBranchPopTrueLong: distance! Item was changed: + ----- Method: EncoderForSistaV1>>genCallInlinePrimitive: (in category 'extended bytecode generation') ----- - ----- Method: EncoderForSistaV1>>genCallInlinePrimitive: (in category 'bytecode generation') ----- genCallInlinePrimitive: primitiveIndex "248 11111000 i i i i i i i i 1jjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256)" "N.B. We could have made CallPrimitive a 2-byte code taking an extension, but that would complicate the VM's determination of the primitive number and the primitive error code store since the extension, being optional, would make the sequence variable length." (primitiveIndex < 1 or: [primitiveIndex > 32767]) ifTrue: [self outOfRangeError: 'primitive index' index: primitiveIndex range: 1 to: 32767]. stream nextPut: 248; nextPut: (primitiveIndex bitAnd: 255); nextPut: (primitiveIndex bitShift: -8) + 128! Item was added: + ----- Method: EncoderForSistaV1>>genNoMustBeBooleanFlag (in category 'extended bytecode generation') ----- + genNoMustBeBooleanFlag + self genUnsignedSingleExtendA: 1! Item was added: + ----- Method: EncoderForSistaV1>>genNoStoreCheckFlag (in category 'extended bytecode generation') ----- + genNoStoreCheckFlag + self genUnsignedSingleExtendB: 1! Item was changed: + ----- Method: EncoderForSistaV1>>genNop (in category 'extended bytecode generation') ----- - ----- Method: EncoderForSistaV1>>genNop (in category 'bytecode generation') ----- genNop "95 01011111 Nop" stream nextPut: 95! Item was added: + ----- Method: EncoderForSistaV1>>genPushFullClosure:numCopied:receiverOnStack:outerContextNeeded: (in category 'extended bytecode generation') ----- + genPushFullClosure: compiledBlockLiteralIndex numCopied: numCopied receiverOnStack: receiverOnStack outerContextNeeded: outerContextNeeded + "* 255 11111111 xxxxxxxx siyyyyyy push Closure Compiled block literal index xxxxxxxx (+ Extend A * 256) numCopied yyyyyy receiverOnStack: s = 1 needsOuterContext: i = 1" + | extendedIndex | + (numCopied < 1 or: [numCopied > 64]) ifTrue: + [self outOfRangeError: 'num copied' index: numCopied range: 1 to: 64]. + (compiledBlockLiteralIndex < 0 or: [compiledBlockLiteralIndex > 32768]) ifTrue: + [^self outOfRangeError: 'index' index: compiledBlockLiteralIndex range: 0 to: 32768]. + (extendedIndex := compiledBlockLiteralIndex) > 255 ifTrue: + [self genUnsignedSingleExtendA: extendedIndex // 256. + extendedIndex := extendedIndex \\ 256]. + stream + nextPut: 255; + nextPut: extendedIndex; + nextPut: receiverOnStack asBit << 7 + (outerContextNeeded asBit << 6) + numCopied! Item was changed: ----- Method: EncoderForSistaV1>>genPushLiteral: (in category 'bytecode generation') ----- genPushLiteral: literalIndex | extendedIndex | + (literalIndex < 0 or: [literalIndex > 32768]) ifTrue: + [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 32768]. - (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: - [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65536]. literalIndex < 32 ifTrue: ["32-63 001iiiii Push Literal #iiiii" stream nextPut: 32 + literalIndex. ^self]. "228 11100100 i i i i i i i i Push Literal #iiiiiiii (+ Extend A * 256)" (extendedIndex := literalIndex) > 255 ifTrue: [self genUnsignedSingleExtendA: extendedIndex // 256. extendedIndex := extendedIndex \\ 256]. stream nextPut: 228; nextPut: extendedIndex! Item was changed: ----- Method: EncoderForSistaV1>>genPushLiteralVar: (in category 'bytecode generation') ----- genPushLiteralVar: literalIndex | extendedIndex | + (literalIndex < 0 or: [literalIndex > 32768]) ifTrue: + [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 32768]. - (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: - [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65535]. literalIndex < 16 ifTrue: ["16-31 0001 i i i i Push Literal Variable #iiii" stream nextPut: 16 + literalIndex. ^self]. "227 11100011 i i i i i i i i Push Literal Variable #iiiiiiii (+ Extend A * 256)" (extendedIndex := literalIndex) > 255 ifTrue: [self genUnsignedSingleExtendA: extendedIndex // 256. extendedIndex := extendedIndex \\ 256]. stream nextPut: 227; nextPut: extendedIndex! Item was added: + ----- Method: EncoderForSistaV1>>genPushRemoteInstanceVariable:inObjectAt: (in category 'extended bytecode generation') ----- + genPushRemoteInstanceVariable: instanceVariableIndex inObjectAt: tempIndex + "251 11111011 kkkkkkkk sjjjjjjj Push Temp At kkkkkkkk In Temp Vector At: jjjjjjj, s = 1 implies remote inst var access instead of remote temp vector access" + + (instanceVariableIndex < 0 or: [instanceVariableIndex > 65535]) ifTrue: + [^self outOfRangeError: 'instanceVariableIndex' index: instanceVariableIndex range: 0 to: 65535]. + (tempIndex < 0 or: [tempIndex >= 128]) ifTrue: + [^self outOfRangeError: 'tempVectorIndex' index: tempIndex range: 0 to: 127]. + instanceVariableIndex > 255 ifTrue: + [self genUnsignedSingleExtendA: instanceVariableIndex // 256]. + stream + nextPut: 251; + nextPut: instanceVariableIndex \\ 256; + nextPut: 1 << 7 + tempIndex! Item was changed: ----- Method: EncoderForSistaV1>>genPushRemoteTemp:inVectorAt: (in category 'bytecode generation') ----- genPushRemoteTemp: tempIndex inVectorAt: tempVectorIndex + "251 11111011 kkkkkkkk sjjjjjjj Push Temp At kkkkkkkk In Temp Vector At: jjjjjjj, s = 1 implies remote inst var access instead of remote temp vector access" - "251 11111011 kkkkkkkk jjjjjjjj Push Temp At kkkkkkkk In Temp Vector At: jjjjjjjj" (tempIndex < 0 or: [tempIndex >= 256]) ifTrue: [^self outOfRangeError: 'remoteTempIndex' index: tempIndex range: 0 to: 255]. + (tempVectorIndex < 0 or: [tempVectorIndex >= 128]) ifTrue: + [^self outOfRangeError: 'tempVectorIndex' index: tempVectorIndex range: 0 to: 127]. - (tempVectorIndex < 0 or: [tempVectorIndex >= 256]) ifTrue: - [^self outOfRangeError: 'tempVectorIndex' index: tempVectorIndex range: 0 to: 255]. stream nextPut: 251; nextPut: tempIndex; nextPut: tempVectorIndex! Item was changed: ----- Method: EncoderForSistaV1>>genStoreLiteralVar: (in category 'bytecode generation') ----- genStoreLiteralVar: literalIndex "244 11110100 iiiiiiii Store Literal Variable #iiiiiiii (+ Extend A * 256)" + (literalIndex < 0 or: [literalIndex > 32768]) ifTrue: + [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 32768]. - (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: - [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65535]. literalIndex > 255 ifTrue: [self genUnsignedSingleExtendA: literalIndex // 256]. stream nextPut: 244; nextPut: literalIndex \\ 256! Item was changed: ----- Method: EncoderForSistaV1>>genStorePopLiteralVar: (in category 'bytecode generation') ----- genStorePopLiteralVar: literalIndex "241 11110001 iiiiiiii Pop and Store Literal Variable #iiiiiiii (+ Extend A * 256)" + (literalIndex < 0 or: [literalIndex > 32768]) ifTrue: + [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 32768]. - (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: - [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65535]. literalIndex > 255 ifTrue: [self genUnsignedSingleExtendA: literalIndex // 256]. stream nextPut: 241; nextPut: literalIndex \\ 256! Item was added: + ----- Method: EncoderForSistaV1>>genStorePopRemoteInstanceVariable:inObjectAt: (in category 'extended bytecode generation') ----- + genStorePopRemoteInstanceVariable: instanceVariableIndex inObjectAt: tempIndex + "*253 (3) 11111101 kkkkkkkk sjjjjjjj Pop and Store Temp At kkkkkkkk In Temp Vector At: jjjjjjj s = 1 implies remote inst var access instead of remote temp vector access" + + (instanceVariableIndex < 0 or: [instanceVariableIndex > 65535]) ifTrue: + [^self outOfRangeError: 'instanceVariableIndex' index: instanceVariableIndex range: 0 to: 65535]. + (tempIndex < 0 or: [tempIndex >= 128]) ifTrue: + [^self outOfRangeError: 'tempVectorIndex' index: tempIndex range: 0 to: 127]. + instanceVariableIndex > 255 ifTrue: + [self genUnsignedSingleExtendA: instanceVariableIndex // 256]. + stream + nextPut: 253; + nextPut: instanceVariableIndex \\ 256; + nextPut: 1 << 7 + tempIndex! Item was changed: ----- Method: EncoderForSistaV1>>genStorePopRemoteTemp:inVectorAt: (in category 'bytecode generation') ----- genStorePopRemoteTemp: tempIndex inVectorAt: tempVectorIndex + "* 253 (3) 11111101 kkkkkkkk sjjjjjjj Pop and Store Temp At kkkkkkkk In Temp Vector At: jjjjjjj s = 1 implies remote inst var access instead of remote temp vector access" - "253 11111101 kkkkkkkk jjjjjjjj Pop and Store Temp At kkkkkkkk In Temp Vector At: jjjjjjjj" (tempIndex < 0 or: [tempIndex >= 256]) ifTrue: [^self outOfRangeError: 'remoteTempIndex' index: tempIndex range: 0 to: 255]. + (tempVectorIndex < 0 or: [tempVectorIndex >= 128]) ifTrue: + [^self outOfRangeError: 'tempVectorIndex' index: tempVectorIndex range: 0 to: 127]. - (tempVectorIndex < 0 or: [tempVectorIndex >= 256]) ifTrue: - [^self outOfRangeError: 'tempVectorIndex' index: tempVectorIndex range: 0 to: 255]. stream nextPut: 253; nextPut: tempIndex; nextPut: tempVectorIndex! Item was added: + ----- Method: EncoderForSistaV1>>genStoreRemoteInstanceVariable:inObjectAt: (in category 'extended bytecode generation') ----- + genStoreRemoteInstanceVariable: instanceVariableIndex inObjectAt: tempIndex + "*252 (3) 11111100 kkkkkkkk sjjjjjjj Store Temp At kkkkkkkk In Temp Vector At: jjjjjjj s = 1 implies remote inst var access instead of remote temp vector access" + + (instanceVariableIndex < 0 or: [instanceVariableIndex > 65535]) ifTrue: + [^self outOfRangeError: 'instanceVariableIndex' index: instanceVariableIndex range: 0 to: 65535]. + (tempIndex < 0 or: [tempIndex >= 128]) ifTrue: + [^self outOfRangeError: 'tempVectorIndex' index: tempIndex range: 0 to: 127]. + instanceVariableIndex > 255 ifTrue: + [self genUnsignedSingleExtendA: instanceVariableIndex // 256]. + stream + nextPut: 252; + nextPut: instanceVariableIndex \\ 256; + nextPut: 1 << 7 + tempIndex! Item was changed: ----- Method: EncoderForSistaV1>>genStoreRemoteTemp:inVectorAt: (in category 'bytecode generation') ----- genStoreRemoteTemp: tempIndex inVectorAt: tempVectorIndex + "*252 (3) 11111100 kkkkkkkk sjjjjjjj Store Temp At kkkkkkkk In Temp Vector At: jjjjjjj s = 1 implies remote inst var access instead of remote temp vector access" - "252 11111100 kkkkkkkk jjjjjjjj Store Temp At kkkkkkkk In Temp Vector At: jjjjjjjj" (tempIndex < 0 or: [tempIndex >= 256]) ifTrue: [^self outOfRangeError: 'remoteTempIndex' index: tempIndex range: 0 to: 255]. + (tempVectorIndex < 0 or: [tempVectorIndex >= 128]) ifTrue: + [^self outOfRangeError: 'tempVectorIndex' index: tempVectorIndex range: 0 to: 127]. - (tempVectorIndex < 0 or: [tempVectorIndex >= 256]) ifTrue: - [^self outOfRangeError: 'tempVectorIndex' index: tempVectorIndex range: 0 to: 255]. stream nextPut: 252; nextPut: tempIndex; nextPut: tempVectorIndex! Item was changed: + ----- Method: EncoderForSistaV1>>genTrap (in category 'extended bytecode generation') ----- - ----- Method: EncoderForSistaV1>>genTrap (in category 'bytecode generation') ----- genTrap "217 11011001 Unconditionnal trap" stream nextPut: 217! Item was added: + BlockClosure variableSubclass: #FullBlockClosure + instanceVariableNames: 'receiver' + classVariableNames: '' + poolDictionaries: '' + category: 'BytecodeSets-SistaV1'! Item was added: + ----- Method: FullBlockClosure>>asContextWithSender: (in category 'private') ----- + asContextWithSender: aContext + "Inner private support method for evaluation. Do not use unless you know what you're doing." + + ^(MethodContext newForMethod: self compiledBlock) + setSender: aContext + receiver: self receiver + method: self compiledBlock + closure: self + startpc: self startpc; + privRefresh! Item was added: + ----- Method: FullBlockClosure>>compiledBlock (in category 'accessing') ----- + compiledBlock + "To be able to inherit from BlockClosure" + ^ startpc! Item was added: + ----- Method: FullBlockClosure>>home (in category 'accessing') ----- + home + ^ outerContext ifNotNil: [ outerContext home ]! Item was added: + ----- Method: FullBlockClosure>>method (in category 'accessing') ----- + method + ^ self compiledBlock! Item was added: + ----- Method: FullBlockClosure>>numTemps (in category 'accessing') ----- + numTemps + ^ self compiledBlock numTemps! Item was added: + ----- Method: FullBlockClosure>>receiver (in category 'accessing') ----- + receiver + ^ receiver! Item was added: + ----- Method: FullBlockClosure>>startpc (in category 'accessing') ----- + startpc + ^ self compiledBlock initialPC!

1 0

VM Maker: VMMaker.oscog-nice.1758.mcz
by commits＠source.squeak.org 03 Apr '16

03 Apr '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1758.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1758 Author: nice Time: 3 April 2016, 4:26:46.014 pm UUID: 054160dc-66a2-450c-b22e-b7de8120f78d Ancestors: VMMaker.oscog-nice.1757 Fix generation of byteSwapped in v3. Sometimes slang rules are just mysterious... =============== Diff against VMMaker.oscog-nice.1757 =============== Item was changed: ----- Method: ObjectMemory>>byteSwapped: (in category 'image save/restore') ----- byteSwapped: w "Answer the given integer with its bytes in the reverse order." <api> <returnTypeC: #sqInt> + ^self cppIf: self wordSize = 4 + ifTrue: [w byteSwap32] + ifFalse: [w byteSwap64]! - self cppIf: self wordSize = 4 - ifTrue: [^w byteSwap32] - ifFalse: [^w byteSwap64]!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-nice.1757.mcz
by Nicolas Cellier 03 Apr '16

03 Apr '16

Note: I've defined 2 more macros: /* Since Large Integers are Bytes Oops allways stored as little endian, the following macros are handy to retrieve 4 or 8 byte limbs */ #if VMBIGENDIAN # define SQ_SWAP_4_BYTES_IF_BIGENDIAN(x) SQ_SWAP_4_BYTES(x) # define SQ_SWAP_8_BYTES_IF_BIGENDIAN(x) SQ_SWAP_8_BYTES(x) #else # define SQ_SWAP_4_BYTES_IF_BIGENDIAN(x) (x) # define SQ_SWAP_8_BYTES_IF_BIGENDIAN(x) (x) #endif which might be more convenient than testing VMBIGENDIAN at each send site. However, this shall necessary go thru objectMemory dispatching, because objectMemory does know, at least for simulation purposes... (objectMemory byteSwap32ifBigEndian: x). Theoretically, I should provide a hook when using an objectMemory message in a plugin like I plan to do with LargeIntegers, but I won't need it because that'll be replaced by a macro by CCodeGenerator (I'll add a hook)... Do you find this OK, or just too crooked? 2016-04-03 0:48 GMT+02:00 <commits(a)source.squeak.org>: > > Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1757.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-nice.1757 > Author: nice > Time: 3 April 2016, 12:47:06.347 am > UUID: a8652aa5-b750-4c29-bb85-283dc8201c29 > Ancestors: VMMaker.oscog-eem.1756 > > Use the byte swap macros as provided by sqMemoryAccess.h since svn 3667 > > Eliminate the now un-necessary related VMBasicConstants. > > Fx a snafu in StackInterpreter>>getWord32FromFile:swap: and > CogVMSimulator>>openOn:extraMemory: that would have swapped64 a long32 on > 64bits VM... > Well, there is no bigEndian 64bits STACK/COG image, so this was only a > theoretical bug. > Note: classical interpreter reads a long for image version, not a word32. > > Fix same snafu in StackInterpreter>>getShortFromFile:swap: alas, I didn't > provide a SQ_SWAP_2_BYTES macro, so open code it for now.... > > =============== Diff against VMMaker.oscog-eem.1756 =============== > > Item was added: > + ----- Method: CCodeGenerator>>generateByteSwap32:on:indent: (in category > 'C translation') ----- > + generateByteSwap32: msgNode on: aStream indent: level > + "Generate the C code for this message onto the given stream." > + > + aStream nextPutAll: #'SQ_SWAP_4_BYTES'. > + aStream nextPut: $(. > + self emitCExpression: msgNode receiver on: aStream. > + aStream nextPut: $)! > > Item was added: > + ----- Method: CCodeGenerator>>generateByteSwap64:on:indent: (in category > 'C translation') ----- > + generateByteSwap64: msgNode on: aStream indent: level > + "Generate the C code for this message onto the given stream." > + > + aStream nextPutAll: #'SQ_SWAP_8_BYTES'. > + aStream nextPut: $(. > + self emitCExpression: msgNode receiver on: aStream. > + aStream nextPut: $)! > > Item was changed: > ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in > category 'C translation support') ----- > initializeCTranslationDictionary > "Initialize the dictionary mapping message names to actions for C > code generation." > > | pairs | > > translationDict := Dictionary new: 200. > pairs := #( > #& #generateAnd:on:indent: > #| #generateOr:on:indent: > #abs #generateAbs:on:indent: > #and: #generateSequentialAnd:on:indent: > #or: #generateSequentialOr:on:indent: > #not #generateNot:on:indent: > > #+ #generatePlus:on:indent: > #- #generateMinus:on:indent: > #negated #generateNegated:on:indent: > #* #generateTimes:on:indent: > #/ #generateDivide:on:indent: > #// #generateDivide:on:indent: > #\\ #generateModulo:on:indent: > #<< #generateShiftLeft:on:indent: > #>> #generateShiftRight:on:indent: > #>>> #generateSignedShiftRight:on:indent: > #min: #generateMin:on:indent: > #max: #generateMax:on:indent: > #between:and: #generateBetweenAnd:on:indent: > > #bitAnd: #generateBitAnd:on:indent: > #bitOr: #generateBitOr:on:indent: > #bitXor: #generateBitXor:on:indent: > #bitShift: #generateBitShift:on:indent: > #signedBitShift: #generateSignedBitShift:on:indent: > #bitInvert32 #generateBitInvert:on:indent: > #bitInvert64 #generateBitInvert:on:indent: > #bitClear: #generateBitClear:on:indent: > #truncateTo: #generateTruncateTo:on:indent: > #rounded #generateRounded:on:indent: > > + #byteSwap32 #generateByteSwap32:on:indent: > + #byteSwap64 #generateByteSwap64:on:indent: > + > #< #generateLessThan:on:indent: > #<= #generateLessThanOrEqual:on:indent: > #= #generateEqual:on:indent: > #> #generateGreaterThan:on:indent: > #>= #generateGreaterThanOrEqual:on:indent: > #~= #generateNotEqual:on:indent: > #== #generateEqual:on:indent: > #~~ #generateNotEqual:on:indent: > #isNil #generateIsNil:on:indent: > #notNil #generateNotNil:on:indent: > > #whileTrue: #generateWhileTrue:on:indent: > #whileFalse: #generateWhileFalse:on:indent: > #whileTrue #generateDoWhileTrue:on:indent: > #whileFalse #generateDoWhileFalse:on:indent: > #to:do: #generateToDo:on:indent: > #to:by:do: #generateToByDo:on:indent: > #repeat #generateRepeat:on:indent: > #timesRepeat: #generateTimesRepeat:on:indent: > > #ifTrue: #generateIfTrue:on:indent: > #ifFalse: #generateIfFalse:on:indent: > #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: > #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: > > #ifNotNil: #generateIfNotNil:on:indent: > #ifNil: #generateIfNil:on:indent: > #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: > #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: > > #at: #generateAt:on:indent: > #at:put: #generateAtPut:on:indent: > #basicAt: #generateAt:on:indent: > #basicAt:put: #generateAtPut:on:indent: > > #integerValueOf: > #generateIntegerValueOf:on:indent: > #integerObjectOf: > #generateIntegerObjectOf:on:indent: > #isIntegerObject: > #generateIsIntegerObject:on:indent: > #cCode: > #generateInlineCCode:on:indent: > #cCode:inSmalltalk: > #generateInlineCCode:on:indent: > #cPreprocessorDirective: > #generateInlineCPreprocessorDirective:on:indent: > #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: > #cppIf:ifTrue: > #generateInlineCppIfElse:on:indent: > #cCoerce:to: > #generateCCoercion:on:indent: > #cCoerceSimple:to: > #generateCCoercion:on:indent: > #addressOf: > #generateAddressOf:on:indent: > #addressOf:put: #generateAddressOf:on:indent: > #asAddress:put: #generateAsAddress:on:indent: > #signedIntFromLong64 > #generateSignedIntFromLong64:on:indent: > #signedIntFromLong > #generateSignedIntFromLong:on:indent: > #signedIntFromShort > #generateSignedIntFromShort:on:indent: > #signedIntToLong64 > #generateSignedIntToLong64:on:indent: > #signedIntToLong > #generateSignedIntToLong:on:indent: > #signedIntToShort > #generateSignedIntToShort:on:indent: > #preIncrement > #generatePreIncrement:on:indent: > #preDecrement #generatePreDecrement:on:indent: > #inline: > #generateInlineDirective:on:indent: > #asFloat > #generateAsFloat:on:indent: > #asInteger > #generateAsInteger:on:indent: > #asUnsignedInteger > #generateAsUnsignedInteger:on:indent: > #asLong #generateAsLong:on:indent: > #asUnsignedLong #generateAsUnsignedLong:on:indent: > #asUnsignedLongLong > #generateAsUnsignedLongLong:on:indent: > #asVoidPointer > #generateAsVoidPointer:on:indent: > #asSymbol > #generateAsSymbol:on:indent: > #flag: > #generateFlag:on:indent: > #anyMask: > #generateBitAnd:on:indent: > #allMask: > #generateAllMask:on:indent: > #noMask: > #generateNoMask:on:indent: > #raisedTo: > #generateRaisedTo:on:indent: > #touch: > #generateTouch:on:indent: > > #bytesPerOop > #generateBytesPerOop:on:indent: > #bytesPerWord #generateBytesPerWord:on:indent: > #wordSize > #generateBytesPerWord:on:indent: > #baseHeaderSize #generateBaseHeaderSize:on:indent: > #minSmallInteger > #generateSmallIntegerConstant:on:indent: > #maxSmallInteger > #generateSmallIntegerConstant:on:indent: > > #sharedCodeNamed:inCase: > #generateSharedCodeDirective:on:indent: > > #perform: > #generatePerform:on:indent: > #perform:with: > #generatePerform:on:indent: > #perform:with:with: > #generatePerform:on:indent: > #perform:with:with:with: > #generatePerform:on:indent: > #perform:with:with:with:with: #generatePerform:on:indent: > #perform:with:with:with:with:with: #generatePerform:on:indent: > > #value > #generateValue:on:indent: > #value: > #generateValue:on:indent: > #value:value: > #generateValue:on:indent: > #value:value:value: > #generateValue:on:indent: > #value:value:value:value: > #generateValue:on:indent: > > #deny: > #generateDeny:on:indent: > > #shouldNotImplement > #generateSmalltalkMetaError:on:indent: > #shouldBeImplemented > #generateSmalltalkMetaError:on:indent: > #subclassResponsibility > #generateSmalltalkMetaError:on:indent: > ). > > 1 to: pairs size by: 2 do: [:i | > translationDict at: (pairs at: i) put: (pairs at: i + 1)]. > > pairs := #( > #ifTrue: > #generateIfTrueAsArgument:on:indent: > #ifFalse: > #generateIfFalseAsArgument:on:indent: > #ifTrue:ifFalse: > #generateIfTrueIfFalseAsArgument:on:indent: > #ifFalse:ifTrue: > #generateIfFalseIfTrueAsArgument:on:indent: > #ifNotNil: > #generateIfNotNilAsArgument:on:indent: > #ifNil: > #generateIfNilAsArgument:on:indent: > #ifNotNil:ifNil: > #generateIfNotNilIfNilAsArgument:on:indent: > #ifNil:ifNotNil: > #generateIfNilIfNotNilAsArgument:on:indent: > #cCode: > #generateInlineCCodeAsArgument:on:indent: > #cCode:inSmalltalk: > #generateInlineCCodeAsArgument:on:indent: > #cppIf:ifTrue:ifFalse: > #generateInlineCppIfElseAsArgument:on:indent: > #cppIf:ifTrue: > #generateInlineCppIfElseAsArgument:on:indent: > > #value > #generateValueAsArgument:on:indent: > #value: > #generateValueAsArgument:on:indent: > #value:value: #generateValueAsArgument:on:indent: > ). > > asArgumentTranslationDict := Dictionary new: 8. > 1 to: pairs size by: 2 do: [:i | > asArgumentTranslationDict at: (pairs at: i) put: (pairs > at: i + 1)]. > ! > > Item was changed: > ----- Method: CogVMSimulator>>openOn:extraMemory: (in category > 'initialization') ----- > openOn: fileName extraMemory: extraBytes > "CogVMSimulator new openOn: 'clone.im' extraMemory: 100000" > > | f version headerSize dataSize count oldBaseAddr bytesToShift > swapBytes > headerFlags firstSegSize heapSize > hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize > hdrCogCodeSize stackZoneSize methodCacheSize primTraceLogSize > allocationReserve | > "open image file and read the header" > > f := FileStream readOnlyFileNamed: fileName. > f ifNil: [^self error: 'no image found']. > > "Set the image name and the first argument; there are > no arguments during simulation unless set explicitly." > systemAttributes at: 1 put: fileName; at: 2 put: nil. > > ["begin ensure block..." > imageName := f fullName. > f binary. > > version := self getWord32FromFile: f swap: false. "current > version: 16r1968 (=6504) vive la revolucion!!" > (self readableFormat: version) > ifTrue: [swapBytes := false] > + ifFalse: [(version := version byteSwap32) = self > imageFormatVersion > - ifFalse: [(version := objectMemory byteSwapped: version) = > self imageFormatVersion > ifTrue: [swapBytes := true] > ifFalse: [self error: > 'incomaptible image format']]. > headerSize := self getWord32FromFile: f swap: swapBytes. > dataSize := self getLongFromFile: f swap: swapBytes. "length of > heap in file" > oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object > memory base address of image" > objectMemory specialObjectsOop: (self getLongFromFile: f swap: > swapBytes). > objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). > "Should be loaded from, and saved to the image header" > > savedWindowSize := self getLongFromFile: f swap: swapBytes. > headerFlags := self getLongFromFile: f swap: swapBytes. > self setImageHeaderFlagsFrom: headerFlags. > extraVMMemory := self getWord32FromFile: f swap: swapBytes. > hdrNumStackPages := self getShortFromFile: f swap: > swapBytes. > "4 stack pages is small. Should be able to run with as few as > three. 4 should be comfortable but slow. 8 is a reasonable > default. Can be changed via vmParameterAt: 43 put: n" > numStackPages := desiredNumStackPages ~= 0 > ifTrue: > [desiredNumStackPages] > ifFalse: [hdrNumStackPages > = 0 > > ifTrue: [self defaultNumStackPages] > > ifFalse: [hdrNumStackPages]]. > desiredNumStackPages := hdrNumStackPages. > stackZoneSize := self computeStackZoneSize. > "This slot holds the size of the native method zone in 1k units. > (pad to word boundary)." > hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * > 1024. > cogCodeSize := desiredCogCodeSize ~= 0 > ifTrue: > [desiredCogCodeSize] > ifFalse: > [hdrCogCodeSize = 0 > > ifTrue: [cogit defaultCogCodeSize] > > ifFalse: [hdrCogCodeSize]]. > desiredCogCodeSize := hdrCogCodeSize. > self assert: f position = (objectMemory wordSize = 4 ifTrue: [40] > ifFalse: [64]). > hdrEdenBytes := self getWord32FromFile: f swap: swapBytes. > objectMemory edenBytes: (desiredEdenBytes ~= 0 > ifTrue: [desiredEdenBytes] > ifFalse: > [hdrEdenBytes = 0 > > ifTrue: [objectMemory defaultEdenBytes] > > ifFalse: [hdrEdenBytes]]). > desiredEdenBytes := hdrEdenBytes. > hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. > hdrMaxExtSemTabSize ~= 0 ifTrue: > [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. > "pad to word boundary. This slot can be used for anything else > that will fit in 16 bits. > Preserve it to be polite to other VMs." > the2ndUnknownShort := self getShortFromFile: f swap: > swapBytes. > self assert: f position = (objectMemory wordSize = 4 ifTrue: [48] > ifFalse: [72]). > firstSegSize := self getLongFromFile: f swap: swapBytes. > objectMemory firstSegmentSize: firstSegSize. > "For Open PICs to be able to probe the method cache during > simulation the methodCache must be relocated to memory." > methodCacheSize := methodCache size * objectMemory wordSize. > primTraceLogSize := primTraceLog size * objectMemory wordSize. > "allocate interpreter memory. This list is in address order, low > to high. > In the actual VM the stack zone exists on the C stack." > heapBase := (Cogit guardPageSize > + cogCodeSize > + stackZoneSize > + methodCacheSize > + primTraceLogSize > + self rumpCStackSize) roundUpTo: > objectMemory allocationUnit. > "compare memory requirements with availability" > allocationReserve := self interpreterAllocationReserveBytes. > objectMemory hasSpurMemoryManagerAPI > ifTrue: > [| freeOldSpaceInImage headroom | > freeOldSpaceInImage := self getLongFromFile: f > swap: swapBytes. > headroom := objectMemory > initialHeadroom: > extraVMMemory > > givenFreeOldSpaceInImage: freeOldSpaceInImage. > heapSize := objectMemory roundUpHeapSize: > dataSize > + headroom > + objectMemory > newSpaceBytes > + (headroom > > allocationReserve > ifTrue: [0] > ifFalse: > [allocationReserve])] > ifFalse: > [heapSize := dataSize > + extraBytes > + objectMemory > newSpaceBytes > + (extraBytes > > allocationReserve > ifTrue: [0] > ifFalse: > [allocationReserve])]. > heapBase := objectMemory > setHeapBase: heapBase > memoryLimit: heapBase + heapSize > endOfMemory: heapBase + dataSize. > > self assert: cogCodeSize \\ 4 = 0. > self assert: objectMemory memoryLimit \\ 4 = 0. > self assert: self rumpCStackSize \\ 4 = 0. > "read in the image in bulk, then swap the bytes if necessary" > f position: headerSize. > objectMemory memory: ((cogit processor endianness == #little > ifTrue: [LittleEndianBitmap] > ifFalse: [Bitmap]) new: > objectMemory memoryLimit // 4). > count := objectMemory readHeapFromImageFile: f dataBytes: dataSize. > count ~= dataSize ifTrue: [self halt]. > ] > ensure: [f close]. > self moveMethodCacheToMemoryAt: objectMemory cogCodeBase + > cogCodeSize + stackZoneSize. > self movePrimTraceLogToMemoryAt: objectMemory cogCodeBase + > cogCodeSize + stackZoneSize + methodCacheSize. > > self ensureImageFormatIsUpToDate: swapBytes. > > bytesToShift := objectMemory memoryBaseForImageRead - > oldBaseAddr. "adjust pointers for zero base address" > Utilities > informUser: 'Relocating object pointers...' > during: [self initializeInterpreter: bytesToShift]. > self initializeCodeGenerator! > > Item was added: > + ----- Method: Integer>>byteSwap32 (in category '*VMMaker-bit > manipulation') ----- > + byteSwap32 > + "swap the bytes of a 32 bit unsigned integer" > + > + ^((self << 24) bitAnd: 16rFF000000) bitOr: > + (((self << 8) bitAnd: 16rFF0000) bitOr: > + (((self >> 8) bitAnd: 16rFF00) bitOr: > + (((self >> 24) bitAnd: 16rFF))))! > > Item was added: > + ----- Method: Integer>>byteSwap64 (in category '*VMMaker-bit > manipulation') ----- > + byteSwap64 > + "swap the bytes of a 64 bit unsigned integer" > + > + ^(((self << 56) bitAnd: 16rFF00000000000000) bitOr: > + (((self << 40) bitAnd: 16rFF000000000000) bitOr: > + (((self << 24) bitAnd: 16rFF0000000000) bitOr: > + (((self << 8) bitAnd: 16rFF00000000) bitOr: > + (((self >> 8) bitAnd: 16rFF000000) bitOr: > + (((self >> 24) bitAnd: 16rFF0000) bitOr: > + (((self >> 40) bitAnd: 16rFF00) bitOr: > + ((self >> 56) bitAnd: 16rFF))))))))! > > Item was changed: > ----- Method: Interpreter>>wordSwapped: (in category 'image > save/restore') ----- > wordSwapped: w > "Return the given 64-bit integer with its halves in the reverse > order." > > self wordSize = 8 ifFalse: [self error: 'This cannot happen.']. > + ^ ((w >> 32) bitAnd: 16r00000000FFFFFFFF) bitOr: > + ((w << 32) bitAnd: 16rFFFFFFFF00000000) > - ^ ((w bitShift: Byte4ShiftNegated) bitAnd: Bytes3to0Mask) > - + ((w bitShift: Byte4Shift ) bitAnd: Bytes7to4Mask) > ! > > Item was changed: > ----- Method: InterpreterPrimitives>>magnitude64BitIntegerFor:neg: (in > category 'primitive support') ----- > magnitude64BitIntegerFor: magnitude neg: isNegative > "Return a Large Integer object for the given integer magnitude and > sign" > | newLargeInteger largeClass highWord sz isSmall smallVal | > <var: 'magnitude' type: #usqLong> > <var: 'highWord' type: #usqInt> > > isSmall := isNegative > ifTrue: [magnitude <= (objectMemory > maxSmallInteger + 1)] > ifFalse: [magnitude <= objectMemory > maxSmallInteger]. > isSmall ifTrue: > [smallVal := self cCoerceSimple: magnitude to: #sqInt. > isNegative ifTrue: [smallVal := 0 - smallVal]. > ^objectMemory integerObjectOf: smallVal]. > > largeClass := isNegative > ifTrue: [objectMemory > classLargeNegativeInteger] > ifFalse: [objectMemory > classLargePositiveInteger]. > objectMemory wordSize = 8 > ifTrue: [sz := 8] > ifFalse: > [(highWord := magnitude >> 32) = 0 > ifTrue: [sz := 4] > ifFalse: > [sz := 5. > (highWord := highWord >> 8) = 0 > ifFalse: > [sz := sz + 1. > (highWord := highWord >> > 8) = 0 ifFalse: > [sz := sz + 1. > (highWord := > highWord >> 8) = 0 ifFalse: [sz := sz + 1]]]]]. > newLargeInteger := objectMemory instantiateClass: largeClass > indexableSize: sz. > self cppIf: VMBIGENDIAN > ifTrue: > + [sz > 4 > + ifTrue: [objectMemory storeLong64: 0 > ofObject: newLargeInteger withValue: magnitude byteSwap64] > + ifFalse: [objectMemory storeLong32: 0 > ofObject: newLargeInteger withValue: (magnitude byteSwap32)]] > - [sz > 4 ifTrue: > - [objectMemory > - storeByte: 7 ofObject: > newLargeInteger withValue: (magnitude >> 56 bitAnd: 16rFF); > - storeByte: 6 ofObject: > newLargeInteger withValue: (magnitude >> 48 bitAnd: 16rFF); > - storeByte: 5 ofObject: > newLargeInteger withValue: (magnitude >> 40 bitAnd: 16rFF); > - storeByte: 4 ofObject: > newLargeInteger withValue: (magnitude >> 32 bitAnd: 16rFF)]. > - objectMemory > - storeByte: 3 ofObject: newLargeInteger > withValue: (magnitude >> 24 bitAnd: 16rFF); > - storeByte: 2 ofObject: newLargeInteger > withValue: (magnitude >> 16 bitAnd: 16rFF); > - storeByte: 1 ofObject: newLargeInteger > withValue: (magnitude >> 8 bitAnd: 16rFF); > - storeByte: 0 ofObject: newLargeInteger > withValue: (magnitude ">> 0" bitAnd: 16rFF)] > ifFalse: > [sz > 4 > ifTrue: [objectMemory storeLong64: 0 > ofObject: newLargeInteger withValue: magnitude] > ifFalse: [objectMemory storeLong32: 0 > ofObject: newLargeInteger withValue: (self cCode: [magnitude] inSmalltalk: > [magnitude bitAnd: 16rFFFFFFFF])]]. > > ^newLargeInteger! > > Item was changed: > ----- Method: InterpreterPrimitives>>magnitude64BitValueOf: (in category > 'primitive support') ----- > magnitude64BitValueOf: oop > "Convert the given object into an integer value. > The object may be either a positive SmallInteger or an eight-byte > LargeInteger." > | sz value ok smallIntValue | > <returnTypeC: #usqLong> > <var: #value type: #usqLong> > > (objectMemory isIntegerObject: oop) ifTrue: > [smallIntValue := (objectMemory integerValueOf: oop). > smallIntValue < 0 ifTrue: [smallIntValue := 0 - > smallIntValue]. > ^self cCoerce: smallIntValue to: #usqLong]. > > (objectMemory isNonIntegerImmediate: oop) ifTrue: > [self primitiveFail. > ^0]. > > ok := objectMemory isClassOfNonImm: oop > equalTo: (objectMemory splObj: > ClassLargePositiveInteger) > compactClassIndex: > ClassLargePositiveIntegerCompactIndex. > ok > ifFalse: > [ok := objectMemory isClassOfNonImm: oop > equalTo: > (objectMemory splObj: ClassLargeNegativeInteger) > compactClassIndex: > ClassLargeNegativeIntegerCompactIndex. > ok ifFalse: > [self primitiveFail. > ^0]]. > sz := objectMemory numBytesOfBytes: oop. > sz > (self sizeof: #sqLong) ifTrue: > [self primitiveFail. > ^0]. > > self cppIf: VMBIGENDIAN > ifTrue: > + [sz > 4 > + ifTrue: [value := (self cCoerceSimple: > (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong) byteSwap64] > + ifFalse: [value := (self cCoerceSimple: > (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') > byteSwap32].] > - [value := objectMemory fetchByte: sz - 1 ofObject: > oop. > - sz - 2 to: 0 by: -1 do: > - [:i | value := value << 8 + (objectMemory > fetchByte: i ofObject: oop)]] > ifFalse: > [sz > 4 > ifTrue: [value := self cCoerceSimple: > (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong] > ifFalse: [value := self cCoerceSimple: > (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int'].]. > ^value! > > Item was changed: > ----- Method: InterpreterPrimitives>>positive32BitValueOf: (in category > 'primitive support') ----- > positive32BitValueOf: oop > "Convert the given object into an integer value. > The object may be either a positive SmallInteger or a four-byte > LargePositiveInteger." > <returnTypeC: #usqInt> > | value ok sz | > (objectMemory isIntegerObject: oop) ifTrue: > [value := objectMemory integerValueOf: oop. > (value < 0 > or: [objectMemory wordSize > 4 > and: [self cCode: [(self cCoerceSimple: value to: > #'unsigned int') ~= value] > inSmalltalk: [value >> 32 ~= 0]]]) > ifTrue: > [self primitiveFail. value := 0]. > ^value]. > > (objectMemory hasSixtyFourBitImmediates > or: [objectMemory isNonIntegerImmediate: oop]) > ifTrue: > [self primitiveFail. > ^0] > ifFalse: > [ok := objectMemory > isClassOfNonImm: oop > equalTo: (objectMemory splObj: > ClassLargePositiveInteger) > compactClassIndex: > ClassLargePositiveIntegerCompactIndex. > ok ifFalse: > [self primitiveFail. > ^0]. > sz := objectMemory numBytesOfBytes: oop. > sz > 4 ifTrue: > [self primitiveFail. > ^0]. > ^self cppIf: VMBIGENDIAN > ifTrue: > + [(objectMemory fetchLong32: 0 > ofObject: oop) byteSwap32] > - [ (objectMemory fetchByte: 0 > ofObject: oop) > - + ((objectMemory fetchByte: 1 > ofObject: oop) << 8) > - + ((objectMemory fetchByte: 2 > ofObject: oop) << 16) > - + ((objectMemory fetchByte: 3 > ofObject: oop) << 24)] > ifFalse: > [objectMemory fetchLong32: 0 > ofObject: oop]]! > > Item was changed: > ----- Method: InterpreterPrimitives>>positive64BitValueOf: (in category > 'primitive support') ----- > positive64BitValueOf: oop > "Convert the given object into an integer value. > The object may be either a positive SmallInteger or an eight-byte > LargePositiveInteger." > > <returnTypeC: #usqLong> > | sz value ok | > <var: #value type: #usqLong> > (objectMemory isIntegerObject: oop) ifTrue: > [(objectMemory integerValueOf: oop) < 0 ifTrue: > [^self primitiveFail]. > ^objectMemory integerValueOf: oop]. > > (objectMemory isNonIntegerImmediate: oop) ifTrue: > [self primitiveFail. > ^0]. > > ok := objectMemory > isClassOfNonImm: oop > equalTo: (objectMemory splObj: > ClassLargePositiveInteger) > compactClassIndex: > ClassLargePositiveIntegerCompactIndex. > ok ifFalse: > [self primitiveFail. > ^0]. > sz := objectMemory numBytesOfBytes: oop. > sz > (self sizeof: #sqLong) ifTrue: > [self primitiveFail. > ^0]. > > self cppIf: VMBIGENDIAN > ifTrue: > + [sz > 4 > + ifTrue: [value := (self cCoerceSimple: > (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong) byteSwap64] > + ifFalse: [value := (self cCoerceSimple: > (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') > byteSwap32].] > - [value := 0. > - 0 to: sz - 1 do: [:i | > - value := value + ((self cCoerce: > (objectMemory fetchByte: i ofObject: oop) to: #usqLong) << (i*8))]] > ifFalse: > [sz > 4 > ifTrue: [value := self cCoerceSimple: > (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong] > ifFalse: [value := self cCoerceSimple: > (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int'].]. > ^value! > > Item was changed: > ----- Method: InterpreterPrimitives>>positiveMachineIntegerValueOf: (in > category 'primitive support') ----- > positiveMachineIntegerValueOf: oop > "Answer a value of an integer in address range, i.e up to the size > of a machine word. > The object may be either a positive SmallInteger or a > LargePositiveInteger of size <= word size." > <returnTypeC: #'unsigned long'> > <inline: true> "only two callers & one is primitiveNewWithArg" > | value bs ok | > (objectMemory isIntegerObject: oop) ifTrue: > [value := objectMemory integerValueOf: oop. > value < 0 ifTrue: [^self primitiveFail]. > ^value]. > > (objectMemory isNonIntegerImmediate: oop) ifTrue: > [self primitiveFail. > ^0]. > > ok := objectMemory > isClassOfNonImm: oop > equalTo: (objectMemory splObj: > ClassLargePositiveInteger) > compactClassIndex: > ClassLargePositiveIntegerCompactIndex. > ok ifFalse: > [self primitiveFail. > ^0]. > bs := objectMemory numBytesOfBytes: oop. > bs > (self sizeof: #'unsigned long') ifTrue: > [self primitiveFail. > ^0]. > > ((self sizeof: #'unsigned long') = 8 > and: [bs > 4]) ifTrue: > [^self cppIf: VMBIGENDIAN > ifTrue: > + [(objectMemory fetchLong64: 0 ofObject: > oop) byteSwap64] > - [ (objectMemory fetchByte: 0 ofObject: > oop) > - + ((objectMemory fetchByte: 1 ofObject: > oop) << 8) > - + ((objectMemory fetchByte: 2 ofObject: > oop) << 16) > - + ((objectMemory fetchByte: 3 ofObject: > oop) << 24) > - + ((objectMemory fetchByte: 4 ofObject: > oop) << 32) > - + ((objectMemory fetchByte: 5 ofObject: > oop) << 40) > - + ((objectMemory fetchByte: 6 ofObject: > oop) << 48) > - + ((objectMemory fetchByte: 7 ofObject: > oop) << 56)] > ifFalse: > [objectMemory fetchLong64: 0 ofObject: > oop]] > ifFalse: > [^self cppIf: VMBIGENDIAN > ifTrue: > + [(self cCoerceSimple: > (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') byteSwap32] > - [ (objectMemory fetchByte: 0 > ofObject: oop) > - + ((objectMemory fetchByte: 1 > ofObject: oop) << 8) > - + ((objectMemory fetchByte: 2 > ofObject: oop) << 16) > - + ((objectMemory fetchByte: 3 > ofObject: oop) << 24)] > ifFalse: > [self cCoerceSimple: (objectMemory > fetchLong32: 0 ofObject: oop) to: #'unsigned int']]! > > Item was changed: > ----- Method: InterpreterPrimitives>>signed32BitValueOf: (in category > 'primitive support') ----- > signed32BitValueOf: oop > "Convert the given object into an integer value. > The object may be either a positive SmallInteger or a four-byte > LargeInteger." > | value negative ok magnitude | > <inline: false> > <returnTypeC: #int> > <var: #value type: #int> > <var: #magnitude type: #'unsigned int'> > <var: #value64 type: #long> > (objectMemory isIntegerObject: oop) ifTrue: > [objectMemory wordSize = 4 > ifTrue: > [^objectMemory integerValueOf: oop] > ifFalse: "Must fail for SmallIntegers with > digitLength > 4" > [| value64 | > value64 := objectMemory integerValueOf: > oop. > (self cCode: [(self cCoerceSimple: > value64 to: #int) ~= value64] > inSmalltalk: [value64 >> > 31 ~= 0 and: [value64 >> 31 ~= -1]]) ifTrue: > [self primitiveFail. value64 := 0]. > ^value64]]. > > (objectMemory isNonIntegerImmediate: oop) ifTrue: > [self primitiveFail. > ^0]. > > ok := objectMemory > isClassOfNonImm: oop > equalTo: (objectMemory splObj: > ClassLargePositiveInteger) > compactClassIndex: > ClassLargePositiveIntegerCompactIndex. > ok > ifTrue: [negative := false] > ifFalse: > [negative := true. > ok := objectMemory isClassOfNonImm: oop > equalTo: > (objectMemory splObj: ClassLargeNegativeInteger) > compactClassIndex: > ClassLargeNegativeIntegerCompactIndex. > ok ifFalse: > [self primitiveFail. > ^0]]. > (objectMemory numBytesOfBytes: oop) > 4 ifTrue: > [^self primitiveFail]. > > magnitude := self cppIf: VMBIGENDIAN > ifTrue: > + [(objectMemory fetchLong32: 0 > ofObject: oop) asUnsignedInteger byteSwap32] > - [ (objectMemory fetchByte: 0 > ofObject: oop) + > - ((objectMemory fetchByte: 1 > ofObject: oop) << 8) + > - ((objectMemory fetchByte: 2 > ofObject: oop) << 16) + > - ((objectMemory fetchByte: 3 > ofObject: oop) << 24)] > ifFalse: > [(objectMemory fetchLong32: 0 > ofObject: oop) asUnsignedInteger]. > > (negative > ifTrue: [magnitude > 16r80000000] > ifFalse: [magnitude >= 16r80000000]) > ifTrue: > [self primitiveFail. > ^0]. > negative > ifTrue: [value := 0 - magnitude] > ifFalse: [value := magnitude]. > ^value! > > Item was changed: > ----- Method: InterpreterPrimitives>>signed64BitValueOf: (in category > 'primitive support') ----- > signed64BitValueOf: oop > "Convert the given object into an integer value. > The object may be either a positive SmallInteger or a eight-byte > LargeInteger." > | sz value negative ok magnitude | > <inline: false> > <returnTypeC: #sqLong> > <var: #value type: #sqLong> > <var: #magnitude type: #usqLong> > (objectMemory isIntegerObject: oop) ifTrue: > [^self cCoerce: (objectMemory integerValueOf: oop) to: > #sqLong]. > > (objectMemory isNonIntegerImmediate: oop) ifTrue: > [self primitiveFail. > ^0]. > > ok := objectMemory isClassOfNonImm: oop > equalTo: (objectMemory splObj: > ClassLargePositiveInteger) > compactClassIndex: > ClassLargePositiveIntegerCompactIndex. > ok > ifTrue: [negative := false] > ifFalse: > [negative := true. > ok := objectMemory isClassOfNonImm: oop > equalTo: > (objectMemory splObj: ClassLargeNegativeInteger) > compactClassIndex: > ClassLargeNegativeIntegerCompactIndex. > ok ifFalse: > [self primitiveFail. > ^0]]. > sz := objectMemory numBytesOfBytes: oop. > sz > (self sizeof: #sqLong) ifTrue: > [self primitiveFail. > ^0]. > > self cppIf: VMBIGENDIAN > ifTrue: > + [magnitude := sz > 4 > + ifTrue: [(objectMemory > fetchLong64: 0 ofObject: oop) byteSwap64] > + ifFalse: [(self > cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned > int') byteSwap32]] > - [magnitude := objectMemory fetchByte: sz - 1 > ofObject: oop. > - sz - 2 to: 0 by: -1 do: [:i | > - magnitude := magnitude << 8 + > (objectMemory fetchByte: i ofObject: oop)]] > ifFalse: > [magnitude := sz > 4 > ifTrue: [objectMemory > fetchLong64: 0 ofObject: oop] > ifFalse: [self > cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned > int']]. > > (negative > ifTrue: [magnitude > 16r8000000000000000] > ifFalse: [magnitude >= 16r8000000000000000]) > ifTrue: [self primitiveFail. > ^0]. > negative > ifTrue: [value := 0 - magnitude] > ifFalse: [value := magnitude]. > ^value! > > Item was changed: > ----- Method: InterpreterPrimitives>>signedMachineIntegerValueOf: (in > category 'primitive support') ----- > signedMachineIntegerValueOf: oop > "Answer a signed value of an integer up to the size of a machine > word. > The object may be either a positive SmallInteger or a LargeInteger > of size <= word size." > <returnTypeC: #'long'> > | negative ok bs value limit magnitude | > <var: #value type: #long> > <var: #magnitude type: #usqInt> > <var: #limit type: #usqInt> > (objectMemory isIntegerObject: oop) ifTrue: > [^objectMemory integerValueOf: oop]. > > (objectMemory isNonIntegerImmediate: oop) ifTrue: > [^self primitiveFail]. > > ok := objectMemory isClassOfNonImm: oop > equalTo: (objectMemory splObj: > ClassLargePositiveInteger) > compactClassIndex: > ClassLargePositiveIntegerCompactIndex. > ok > ifTrue: [negative := false] > ifFalse: > [negative := true. > ok := objectMemory isClassOfNonImm: oop > equalTo: > (objectMemory splObj: ClassLargeNegativeInteger) > compactClassIndex: > ClassLargeNegativeIntegerCompactIndex. > ok ifFalse: [^self primitiveFail]]. > bs := objectMemory numBytesOf: oop. > bs > (self sizeof: #'unsigned long') ifTrue: > [^self primitiveFail]. > > ((self sizeof: #'unsigned long') = 8 > and: [bs > 4]) ifTrue: > [magnitude := self cppIf: VMBIGENDIAN > ifTrue: > + [(objectMemory > fetchLong64: 0 ofObject: oop) byteSwap64] > - [ (objectMemory > fetchByte: 0 ofObject: oop) > - + ((objectMemory > fetchByte: 1 ofObject: oop) << 8) > - + ((objectMemory > fetchByte: 2 ofObject: oop) << 16) > - + ((objectMemory > fetchByte: 3 ofObject: oop) << 24) > - + ((objectMemory > fetchByte: 4 ofObject: oop) << 32) > - + ((objectMemory > fetchByte: 5 ofObject: oop) << 40) > - + ((objectMemory > fetchByte: 6 ofObject: oop) << 48) > - + ((objectMemory > fetchByte: 7 ofObject: oop) << 56)] > ifFalse: > [objectMemory fetchLong64: > 0 ofObject: oop]] > ifFalse: > [magnitude := self cppIf: VMBIGENDIAN > ifTrue: > + [(objectMemory > fetchLong32: 0 ofObject: oop) asUnsignedInteger byteSwap32] > - [ (objectMemory > fetchByte: 0 ofObject: oop) > - + ((objectMemory > fetchByte: 1 ofObject: oop) << 8) > - + ((objectMemory > fetchByte: 2 ofObject: oop) << 16) > - + ((objectMemory > fetchByte: 3 ofObject: oop) << 24)] > ifFalse: > [(objectMemory > fetchLong32: 0 ofObject: oop) asUnsignedInteger]]. > > limit := 1 asUnsignedInteger << ((self sizeof: #usqInt) * 8 - 1). > (negative > ifTrue: [magnitude > limit] > ifFalse: [magnitude >= limit]) > ifTrue: [self primitiveFail. > ^0]. > negative > ifTrue: [value := 0 - magnitude] > ifFalse: [value := magnitude]. > ^value! > > Item was changed: > ----- Method: InterpreterSimulatorMSB64>>byteSwapped: (in category > 'memory access') ----- > byteSwapped: w > "Return the given integer with its bytes in the reverse order." > > + ^w byteSwap64! > - ^ (super byteSwapped: ((w bitShift: -32) bitAnd: 16rFFFFFFFF)) + > - ((super byteSwapped: (w bitAnd: 16rFFFFFFFF)) bitShift: 32)! > > Item was changed: > ----- Method: LargeIntegersPlugin>>cDigitSub:len:with:len:into: (in > category 'C core') ----- > cDigitSub: pByteSmall len: smallLen with: pByteLarge len: largeLen into: > pByteRes > | z | > <var: #pByteSmall type: #'unsigned char *'> > <var: #pByteLarge type: #'unsigned char *'> > <var: #pByteRes type: #'unsigned char *'> > + <var: #z type: #'unsigned int'> > > z := 0. "Loop invariant is -1<=z<=1" > 0 to: smallLen - 1 do: > [:i | > z := z + (pByteLarge at: i) - (pByteSmall at: i). > pByteRes at: i put: (self cCode: [z] inSmalltalk: [z > bitAnd: 255]). > z := z signedBitShift: -8]. > smallLen to: largeLen - 1 do: > [:i | > z := z + (pByteLarge at: i) . > pByteRes at: i put: (self cCode: [z] inSmalltalk: [z > bitAnd: 255]). > z := z signedBitShift: -8]. > ! > > Item was changed: > ----- Method: ObjectMemory class>>initBytesPerWord: (in category > 'initialization') ----- > initBytesPerWord: nBytes > > BytesPerWord := nBytes. > - "The following is necessary to avoid confusing the compiler with > shifts that are larger than the width of the type on which they operate. > In gcc, such shifts cause incorrect code to be generated." > - BytesPerWord = 8 > - ifTrue: "64-bit VM" > - [Byte0Mask := 16r00000000000000FF. Byte0Shift > := 0. > - Byte1Mask := 16r000000000000FF00. Byte1Shift > := 8. > - Byte2Mask := 16r0000000000FF0000. Byte2Shift > := 16. > - Byte3Mask := 16r00000000FF000000. Byte3Shift > := 24. > - Byte4Mask := 16r000000FF00000000. Byte4Shift > := 32. > - Byte5Mask := 16r0000FF0000000000. Byte5Shift > := 40. > - Byte6Mask := 16r00FF000000000000. Byte6Shift > := 48. > - Byte7Mask := 16rFF00000000000000. Byte7Shift > := 56. > - Bytes3to0Mask := 16r00000000FFFFFFFF. > - Bytes7to4Mask := 16rFFFFFFFF00000000] > - ifFalse: "32-bit VM" > - [Byte0Mask := 16r00000000000000FF. Byte0Shift > := 0. > - Byte1Mask := 16r000000000000FF00. Byte1Shift > := 8. > - Byte2Mask := 16r0000000000FF0000. Byte2Shift > := 16. > - Byte3Mask := 16r00000000FF000000. Byte3Shift > := 24. > - Byte4Mask := 16r0000000000000000. Byte4Shift > := 0. "unused" > - Byte5Mask := 16r0000000000000000. Byte5Shift > := 0. "unused" > - Byte6Mask := 16r0000000000000000. Byte6Shift > := 0. "unused" > - Byte7Mask := 16r0000000000000000. Byte7Shift > := 0. "unused" > - Bytes3to0Mask := 16r0000000000000000. > "unused" > - Bytes7to4Mask := 16r0000000000000000 > "unused"]. > - Byte1ShiftNegated := Byte1Shift negated. > - Byte3ShiftNegated := Byte3Shift negated. > - Byte4ShiftNegated := Byte4Shift negated. > - Byte5ShiftNegated := Byte5Shift negated. > - Byte7ShiftNegated := Byte7Shift negated. > "N.B. This is *not* output when generating the interpreter file. > It is left to the various sqConfig.h files to define correctly." > VMBIGENDIAN := Smalltalk endianness == #big! > > Item was changed: > ----- Method: ObjectMemory>>byteSwapped: (in category 'image > save/restore') ----- > byteSwapped: w > "Answer the given integer with its bytes in the reverse order." > <api> > <returnTypeC: #sqInt> > self cppIf: self wordSize = 4 > + ifTrue: [^w byteSwap32] > + ifFalse: [^w byteSwap64]! > - ifTrue: > - [^ ((w bitShift: Byte3ShiftNegated) bitAnd: > Byte0Mask) > - + ((w bitShift: Byte1ShiftNegated) bitAnd: > Byte1Mask) > - + ((w bitShift: Byte1Shift ) bitAnd: > Byte2Mask) > - + ((w bitShift: Byte3Shift ) bitAnd: > Byte3Mask)] > - ifFalse: > - [^ ((w bitShift: Byte7ShiftNegated) bitAnd: > Byte0Mask) > - + ((w bitShift: Byte5ShiftNegated) bitAnd: > Byte1Mask) > - + ((w bitShift: Byte3ShiftNegated) bitAnd: > Byte2Mask) > - + ((w bitShift: Byte1ShiftNegated) bitAnd: > Byte3Mask) > - + ((w bitShift: Byte1Shift ) bitAnd: > Byte4Mask) > - + ((w bitShift: Byte3Shift ) bitAnd: > Byte5Mask) > - + ((w bitShift: Byte5Shift ) bitAnd: > Byte6Mask) > - + ((w bitShift: Byte7Shift ) bitAnd: > Byte7Mask)]! > > Item was removed: > - ----- Method: Spur32BitMemoryManager>>byteSwapped32Bits: (in category > 'snapshot') ----- > - byteSwapped32Bits: w > - ^self byteSwapped: w! > > Item was changed: > ----- Method: Spur32BitMemoryManager>>byteSwapped: (in category > 'snapshot') ----- > byteSwapped: w > "Answer the given integer with its bytes in the reverse order." > <api> > <returnTypeC: #sqInt> > + ^w byteSwap32! > - ^ ((w bitShift: Byte3ShiftNegated) bitAnd: Byte0Mask) > - + ((w bitShift: Byte1ShiftNegated) bitAnd: Byte1Mask) > - + ((w bitShift: Byte1Shift ) bitAnd: Byte2Mask) > - + ((w bitShift: Byte3Shift ) bitAnd: Byte3Mask)! > > Item was removed: > - ----- Method: Spur64BitMemoryManager>>byteSwapped32Bits: (in category > 'snapshot') ----- > - byteSwapped32Bits: w > - "Answer the given 32-bit integer with its bytes in the reverse > order." > - ^ ((w bitShift: Byte3ShiftNegated) bitAnd: Byte0Mask) > - + ((w bitShift: Byte1ShiftNegated) bitAnd: Byte1Mask) > - + ((w bitShift: Byte1Shift ) bitAnd: Byte2Mask) > - + ((w bitShift: Byte3Shift ) bitAnd: Byte3Mask)! > > Item was changed: > ----- Method: Spur64BitMemoryManager>>byteSwapped: (in category > 'snapshot') ----- > byteSwapped: w > "Answer the given integer with its bytes in the reverse order." > <api> > <returnTypeC: #sqInt> > + ^w byteSwap64! > - ^ ((w bitShift: Byte7ShiftNegated) bitAnd: Byte0Mask) > - + ((w bitShift: Byte5ShiftNegated) bitAnd: Byte1Mask) > - + ((w bitShift: Byte3ShiftNegated) bitAnd: Byte2Mask) > - + ((w bitShift: Byte1ShiftNegated) bitAnd: Byte3Mask) > - + ((w bitShift: Byte1Shift ) bitAnd: Byte4Mask) > - + ((w bitShift: Byte3Shift ) bitAnd: Byte5Mask) > - + ((w bitShift: Byte5Shift ) bitAnd: Byte6Mask) > - + ((w bitShift: Byte7Shift ) bitAnd: Byte7Mask)! > > Item was changed: > ----- Method: SpurMemoryManager class>>initBytesPerWord: (in category > 'class initialization') ----- > initBytesPerWord: wordSize > > BytesPerWord := BytesPerOop := wordSize. > - "The following is necessary to avoid confusing the compiler with > shifts that are larger than the width of the type on which they operate. > In gcc, such shifts cause incorrect code to be generated." > - BytesPerWord = 8 > - ifTrue: "64-bit VM" > - [Byte0Mask := 16r00000000000000FF. Byte0Shift > := 0. > - Byte1Mask := 16r000000000000FF00. Byte1Shift > := 8. > - Byte2Mask := 16r0000000000FF0000. Byte2Shift > := 16. > - Byte3Mask := 16r00000000FF000000. Byte3Shift > := 24. > - Byte4Mask := 16r000000FF00000000. Byte4Shift > := 32. > - Byte5Mask := 16r0000FF0000000000. Byte5Shift > := 40. > - Byte6Mask := 16r00FF000000000000. Byte6Shift > := 48. > - Byte7Mask := 16rFF00000000000000. Byte7Shift > := 56. > - Bytes3to0Mask := 16r00000000FFFFFFFF. > - Bytes7to4Mask := 16rFFFFFFFF00000000] > - ifFalse: "32-bit VM" > - [Byte0Mask := 16r00000000000000FF. Byte0Shift > := 0. > - Byte1Mask := 16r000000000000FF00. Byte1Shift > := 8. > - Byte2Mask := 16r0000000000FF0000. Byte2Shift > := 16. > - Byte3Mask := 16r00000000FF000000. Byte3Shift > := 24. > - Byte4Mask := nil. > Byte4Shift := 0. "unused" > - Byte5Mask := nil. > Byte5Shift := 0. "unused" > - Byte6Mask := nil. > Byte6Shift := 0. "unused" > - Byte7Mask := nil. > Byte7Shift := 0. "unused" > - Bytes3to0Mask := nil. > "unused" > - Bytes7to4Mask := nil > "unused"]. > - Byte1ShiftNegated := Byte1Shift negated. > - Byte3ShiftNegated := Byte3Shift negated. > - Byte4ShiftNegated := Byte4Shift negated. > - Byte5ShiftNegated := Byte5Shift negated. > - Byte7ShiftNegated := Byte7Shift negated. > "N.B. This is *not* output when generating the interpreter file. > It is left to the various sqConfig.h files to define correctly." > VMBIGENDIAN := Smalltalk endianness == #big! > > Item was removed: > - ----- Method: SpurMemoryManager>>byteSwapped32Bits: (in category > 'snapshot') ----- > - byteSwapped32Bits: w > - self subclassResponsibility! > > Item was changed: > ----- Method: SpurMemoryManager>>reverseBytesIn32BitWordsFrom:to: (in > category 'snapshot') ----- > reverseBytesIn32BitWordsFrom: startAddr to: stopAddr > "Byte-swap the given range of memory (not inclusive of > stopAddr!!)." > | addr | > addr := startAddr. > [self oop: addr isLessThan: stopAddr] whileTrue: > + [self long32At: addr put: ((self long32At: addr) > byteSwap32). > - [self long32At: addr put: (self byteSwapped32Bits: (self > long32At: addr)). > addr := addr + 4]! > > Item was changed: > ----- Method: StackInterpreter>>getShortFromFile:swap: (in category > 'image save/restore') ----- > getShortFromFile: aFile swap: swapFlag > "Answer the next 16 bit word read from aFile, byte-swapped > according to the swapFlag." > > <var: #aFile type: #sqImageFile> > | w | > + <var: #w type: #'unsigned short'> > - <var: #w type: #short> > w := 0. > self cCode: [self > sq: (self addressOf: w) > + Image: (self sizeof: #'unsigned > short') > - Image: (self sizeof: #short) > File: 1 > Read: aFile] > inSmalltalk: [w := objectMemory nextShortFrom: aFile]. > ^swapFlag > + ifTrue: [((w >> 8) bitAnd: 16rFF) bitOr: ((w bitAnd: > 16rFF) << 8)] > - ifTrue: [objectMemory byteSwapped: w] > ifFalse: [w]! > > Item was changed: > ----- Method: StackInterpreter>>getWord32FromFile:swap: (in category > 'image save/restore') ----- > getWord32FromFile: aFile swap: swapFlag > "Answer the next 32 bit word read from aFile, byte-swapped > according to the swapFlag." > > <var: #aFile type: #sqImageFile> > | w | > <var: #w type: #int> > w := 0. > self cCode: [self > sq: (self addressOf: w) > Image: (self sizeof: #int) > File: 1 > Read: aFile] > inSmalltalk: [w := objectMemory nextWord32From: aFile]. > ^swapFlag > + ifTrue: [w byteSwap32] > - ifTrue: [objectMemory byteSwapped: w] > ifFalse: [w]! > > Item was changed: > ----- Method: StackInterpreter>>maybeInlinePositive32BitIntegerFor: (in > category 'primitive support') ----- > maybeInlinePositive32BitIntegerFor: integerValue > "N.B. will *not* cause a GC. > integerValue is interpreted as POSITIVE, e.g. as the result of > Bitmap>at:." > <notOption: #Spur64BitMemoryManager> > <var: 'integerValue' type: #'unsigned int'> > | newLargeInteger | > self deny: objectMemory hasSixtyFourBitImmediates. > "force coercion because slang inliner sometimes incorrectly pass > a signed int without converting to unsigned" > (self cCode: [self cCoerceSimple: integerValue to: #'unsigned > int'] > inSmalltalk: [integerValue bitAnd: 1 << 32 - 1]) > <= objectMemory maxSmallInteger ifTrue: > [^objectMemory integerObjectOf: integerValue]. > newLargeInteger := objectMemory > > eeInstantiateSmallClassIndex: ClassLargePositiveIntegerCompactIndex > format: > (objectMemory byteFormatForNumBytes: 4) > numSlots: 1. > self cppIf: VMBIGENDIAN > ifTrue: > + [objectMemory storeLong32: 0 ofObject: > newLargeInteger withValue: integerValue byteSwap32] > - [objectMemory > - storeByte: 3 ofObject: newLargeInteger > withValue: (integerValue >> 24 bitAnd: 16rFF); > - storeByte: 2 ofObject: newLargeInteger > withValue: (integerValue >> 16 bitAnd: 16rFF); > - storeByte: 1 ofObject: newLargeInteger > withValue: (integerValue >> 8 bitAnd: 16rFF); > - storeByte: 0 ofObject: newLargeInteger > withValue: (integerValue ">> 0" bitAnd: 16rFF)] > ifFalse: > [objectMemory storeLong32: 0 ofObject: > newLargeInteger withValue: integerValue]. > ^newLargeInteger! > > Item was changed: > ----- Method: StackInterpreter>>noInlineSigned32BitIntegerFor: (in > category 'primitive support') ----- > noInlineSigned32BitIntegerFor: integerValue > "Answer a full 32 bit integer object for the given integer value." > <notOption: #Spur64BitMemoryManager> > | newLargeInteger value largeClass | > <inline: false> > (objectMemory isIntegerValue: integerValue) ifTrue: > [^objectMemory integerObjectOf: integerValue]. > self deny: objectMemory hasSixtyFourBitImmediates. > integerValue < 0 > ifTrue: [largeClass := > ClassLargeNegativeIntegerCompactIndex. > value := 0 - integerValue] > ifFalse: [largeClass := > ClassLargePositiveIntegerCompactIndex. > value := integerValue]. > newLargeInteger := objectMemory > > eeInstantiateSmallClassIndex: largeClass > format: > (objectMemory byteFormatForNumBytes: 4) > numSlots: 1. > self cppIf: VMBIGENDIAN > ifTrue: > + [objectMemory storeLong32: 0 ofObject: > newLargeInteger withValue: value byteSwap32] > - [objectMemory > - storeByte: 3 ofObject: newLargeInteger > withValue: ((value >> 24) bitAnd: 16rFF); > - storeByte: 2 ofObject: newLargeInteger > withValue: ((value >> 16) bitAnd: 16rFF); > - storeByte: 1 ofObject: newLargeInteger > withValue: ((value >> 8) bitAnd: 16rFF); > - storeByte: 0 ofObject: newLargeInteger > withValue: (value bitAnd: 16rFF)] > ifFalse: > [objectMemory storeLong32: 0 ofObject: > newLargeInteger withValue: value]. > ^newLargeInteger! > > Item was changed: > ----- Method: StackInterpreter>>positive64BitIntegerFor: (in category > 'primitive support') ----- > positive64BitIntegerFor: integerValue > <api> > <var: 'integerValue' type: #usqLong> > <var: 'highWord' type: #'unsigned int'> > "Answer a Large Positive Integer object for the given integer > value. N.B. will *not* cause a GC." > | newLargeInteger highWord sz | > objectMemory hasSixtyFourBitImmediates > ifTrue: > [(self cCode: [integerValue] inSmalltalk: > [integerValue bitAnd: 1 << 64 - 1]) <= objectMemory maxSmallInteger ifTrue: > [^objectMemory integerObjectOf: > integerValue]. > sz := 8] > ifFalse: > [(highWord := integerValue >> 32) = 0 ifTrue: > [^self positive32BitIntegerFor: > integerValue]. > sz := 5. > (highWord := highWord >> 8) = 0 ifFalse: > [sz := sz + 1. > (highWord := highWord >> 8) = 0 ifFalse: > [sz := sz + 1. > (highWord := highWord >> 8) = 0 > ifFalse:[sz := sz + 1]]]]. > newLargeInteger := objectMemory > > eeInstantiateSmallClassIndex: ClassLargePositiveIntegerCompactIndex > format: > (objectMemory byteFormatForNumBytes: sz) > numSlots: 8 / > objectMemory bytesPerOop. > self cppIf: VMBIGENDIAN > ifTrue: > + [objectMemory storeLong64: 0 ofObject: > newLargeInteger withValue: integerValue byteSwap64] > - [objectMemory > - storeByte: 7 ofObject: newLargeInteger > withValue: (integerValue >> 56 bitAnd: 16rFF); > - storeByte: 6 ofObject: newLargeInteger > withValue: (integerValue >> 48 bitAnd: 16rFF); > - storeByte: 5 ofObject: newLargeInteger > withValue: (integerValue >> 40 bitAnd: 16rFF); > - storeByte: 4 ofObject: newLargeInteger > withValue: (integerValue >> 32 bitAnd: 16rFF); > - storeByte: 3 ofObject: newLargeInteger > withValue: (integerValue >> 24 bitAnd: 16rFF); > - storeByte: 2 ofObject: newLargeInteger > withValue: (integerValue >> 16 bitAnd: 16rFF); > - storeByte: 1 ofObject: newLargeInteger > withValue: (integerValue >> 8 bitAnd: 16rFF); > - storeByte: 0 ofObject: newLargeInteger > withValue: (integerValue ">> 0" bitAnd: 16rFF)] > ifFalse: > [objectMemory storeLong64: 0 ofObject: > newLargeInteger withValue: integerValue]. > ^newLargeInteger > ! > > Item was changed: > ----- Method: StackInterpreter>>signed64BitIntegerFor: (in category > 'primitive support') ----- > signed64BitIntegerFor: integerValue > <var: 'integerValue' type: #sqLong> > "Answer a Large Integer object for the given integer value. N.B. > will *not* cause a GC." > | newLargeInteger magnitude largeClass highWord sz | > <inline: false> > <var: 'magnitude' type: #usqLong> > <var: 'highWord' type: #usqInt> > > integerValue < 0 > ifTrue:[ integerValue >= objectMemory > minSmallInteger ifTrue: [^objectMemory integerObjectOf: integerValue > asInteger]. > largeClass := > ClassLargeNegativeIntegerCompactIndex. > magnitude := 0 - (self cCoerceSimple: > integerValue to: #usqLong)] > ifFalse:[ integerValue <= objectMemory > maxSmallInteger ifTrue: [^objectMemory integerObjectOf: integerValue > asInteger]. > largeClass := > ClassLargePositiveIntegerCompactIndex. > magnitude := integerValue]. > > objectMemory wordSize = 8 > ifTrue: [sz := 8] > ifFalse: [ > (highWord := magnitude >> 32) = 0 > ifTrue: [sz := 4] > ifFalse: > [sz := 5. > (highWord := highWord >> 8) = 0 ifFalse: > [sz := sz + 1. > (highWord := highWord >> 8) = 0 > ifFalse: > [sz := sz + 1. > (highWord := highWord >> > 8) = 0 ifFalse: > [sz := sz + 1]]]]]. > > newLargeInteger := objectMemory > > eeInstantiateSmallClassIndex: largeClass > format: > (objectMemory byteFormatForNumBytes: sz) > numSlots: sz + 3 > // objectMemory bytesPerOop. > self cppIf: VMBIGENDIAN > ifTrue: > + [sz > 4 > + ifTrue: [objectMemory storeLong64: 0 > ofObject: newLargeInteger withValue: magnitude byteSwap64] > + ifFalse: [objectMemory storeLong32: 0 > ofObject: newLargeInteger withValue: magnitude byteSwap32]] > - [sz > 4 ifTrue: > - [objectMemory > - storeByte: 7 ofObject: > newLargeInteger withValue: (magnitude >> 56 bitAnd: 16rFF); > - storeByte: 6 ofObject: > newLargeInteger withValue: (magnitude >> 48 bitAnd: 16rFF); > - storeByte: 5 ofObject: > newLargeInteger withValue: (magnitude >> 40 bitAnd: 16rFF); > - storeByte: 4 ofObject: > newLargeInteger withValue: (magnitude >> 32 bitAnd: 16rFF)]. > - objectMemory > - storeByte: 3 ofObject: newLargeInteger > withValue: (magnitude >> 24 bitAnd: 16rFF); > - storeByte: 2 ofObject: newLargeInteger > withValue: (magnitude >> 16 bitAnd: 16rFF); > - storeByte: 1 ofObject: newLargeInteger > withValue: (magnitude >> 8 bitAnd: 16rFF); > - storeByte: 0 ofObject: newLargeInteger > withValue: (magnitude ">> 0" bitAnd: 16rFF)] > ifFalse: > [sz > 4 > ifTrue: [objectMemory storeLong64: 0 > ofObject: newLargeInteger withValue: magnitude] > ifFalse: [objectMemory storeLong32: 0 > ofObject: newLargeInteger withValue: (self cCode: [magnitude] inSmalltalk: > [magnitude bitAnd: 16rFFFFFFFF])]]. > ^newLargeInteger! > > Item was changed: > ----- Method: StackInterpreter>>wordSwapped: (in category 'image > save/restore') ----- > wordSwapped: w > "Return the given 64-bit integer with its halves in the reverse > order." > > objectMemory wordSize = 8 ifFalse: [self error: 'This cannot > happen.']. > + ^ ((w >> 32) bitAnd: 16r00000000FFFFFFFF) bitOr: > + ((w << 32) bitAnd: 16rFFFFFFFF00000000) > - ^ ((w bitShift: Byte4ShiftNegated) bitAnd: Bytes3to0Mask) > - + ((w bitShift: Byte4Shift ) bitAnd: Bytes7to4Mask) > ! > > Item was changed: > ----- Method: > ThreadedFFIPlugin>>ffiCreateIntegralResultOop:ofAtomicType:in: (in category > 'callout support') ----- > ffiCreateIntegralResultOop: retVal ofAtomicType: atomicType in: > calloutState > <inline: true> > <var: #calloutState type: #'CalloutState *'> > <var: #retVal type: #usqLong> > "Callout support. Return the appropriate oop for the given atomic > type" > | shift value mask byteSize | > <var: 'value' type: #usqLong> > <var: 'mask' type: #usqLong> > self assert: atomicType < FFITypeSingleFloat. > > atomicType = FFITypeBool ifTrue: > ["Make sure bool honors the byte size requested" > byteSize := calloutState ffiRetHeader bitAnd: > FFIStructSizeMask. > value := byteSize = (self sizeof: retVal) > ifTrue:[retVal] > ifFalse:[retVal bitAnd: 1 << > (byteSize * 8) - 1]. > ^value = 0 > ifTrue:[interpreterProxy falseObject] > ifFalse:[interpreterProxy trueObject]]. > atomicType <= FFITypeSignedInt ifTrue: > ["these are all generall integer returns" > atomicType <= (BytesPerWord = 8 ifTrue: [FFITypeSignedInt] > ifFalse: [FFITypeSignedShort]) ifTrue: > ["byte/short. first extract partial word, then > sign extend" > shift := (BytesPerWord = 8 and: [atomicType >= > FFITypeUnsignedInt]) > ifTrue: [32] > ifFalse: [(atomicType >> > 1) * 8]. "# of significant bits" > value := retVal bitAnd: (1 asUnsignedLong << shift > - 1). > (atomicType anyMask: 1) ifTrue: > ["make the guy signed" > mask := 1 asUnsignedLong << (shift-1). > value := (value bitAnd: mask-1) - (value > bitAnd: mask)]. > ^interpreterProxy integerObjectOf: value]. > "Word sized integer return" > ^(atomicType anyMask: 1) > ifTrue:[interpreterProxy signedMachineIntegerFor: > retVal] "signed return" > ifFalse:[interpreterProxy > positiveMachineIntegerFor: retVal]]. "unsigned return" > > "longlong, char" > ^(atomicType >> 1) = (FFITypeSignedLongLong >> 1) > ifTrue: > [(atomicType anyMask: 1) > ifTrue:[interpreterProxy > signed64BitIntegerFor: retVal] "signed return" > ifFalse:[interpreterProxy > positive64BitIntegerFor: retVal]] > ifFalse: > + [interpreterProxy characterObjectOf: (retVal > bitAnd: 16rFF)]! > - [interpreterProxy characterObjectOf: (retVal > bitAnd: Byte0Mask)]! > > Item was changed: > SharedPool subclass: #VMBasicConstants > instanceVariableNames: '' > + classVariableNames: 'BaseHeaderSize BytesPerOop BytesPerWord > COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks > DoExpensiveAssertionChecks GCModeBecome GCModeFreeSpace GCModeFull > GCModeImageSegment GCModeIncremental GCModeNewSpace IMMUTABILITY > MULTIPLEBYTECODESETS NewspeakVM PharoVM PrimErrBadArgument PrimErrBadIndex > PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure > PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal > PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound > PrimErrObjectIsPinned PrimErrObjectMayMove PrimErrUnsupported > PrimErrWritePastObject PrimNoErr SPURVM STACKVM SistaVM VMBIGENDIAN' > - classVariableNames: 'BaseHeaderSize Byte0Mask Byte0Shift Byte1Mask > Byte1Shift Byte1ShiftNegated Byte2Mask Byte2Shift Byte3Mask Byte3Shift > Byte3ShiftNegated Byte4Mask Byte4Shift Byte4ShiftNegated Byte5Mask > Byte5Shift Byte5ShiftNegated Byte6Mask Byte6Shift Byte7Mask Byte7Shift > Byte7ShiftNegated Bytes3to0Mask Bytes7to4Mask BytesPerOop BytesPerWord > COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks > DoExpensiveAssertionChecks GCModeBecome GCModeFreeSpace GCModeFull > GCModeImageSegment GCModeIncremental GCModeNewSpace IMMUTABILITY > MULTIPLEBYTECODESETS NewspeakVM PharoVM PrimErrBadArgument PrimErrBadIndex > PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure > PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal > PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound > PrimErrObjectIsPinned PrimErrObjectMayMove PrimErrUnsupported > PrimErrWritePastObject PrimNoErr SPURVM STACKVM SistaVM VMBIGENDIAN' > poolDictionaries: '' > category: 'VMMaker-Interpreter'! > > !VMBasicConstants commentStamp: '<historical>' prior: 0! > I am a shared pool for basic constants upon which the VM as a whole > depends. > > self ensureClassPool. > self classPool declare: #BytesPerWord from: > VMSqueakV3ObjectRepresentationConstants classPool. > self classPool declare: #BaseHeaderSize from: > VMSqueakV3ObjectRepresentationConstants classPool > (ObjectMemory classPool keys select: [:k| k beginsWith: 'Byte']) do: > [:k| self classPool declare: k from: ObjectMemory classPool]! > >

1 0

VM Maker: VMMaker.oscog-nice.1757.mcz
by commits＠source.squeak.org 03 Apr '16

03 Apr '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1757.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1757 Author: nice Time: 3 April 2016, 12:47:06.347 am UUID: a8652aa5-b750-4c29-bb85-283dc8201c29 Ancestors: VMMaker.oscog-eem.1756 Use the byte swap macros as provided by sqMemoryAccess.h since svn 3667 Eliminate the now un-necessary related VMBasicConstants. Fx a snafu in StackInterpreter>>getWord32FromFile:swap: and CogVMSimulator>>openOn:extraMemory: that would have swapped64 a long32 on 64bits VM... Well, there is no bigEndian 64bits STACK/COG image, so this was only a theoretical bug. Note: classical interpreter reads a long for image version, not a word32. Fix same snafu in StackInterpreter>>getShortFromFile:swap: alas, I didn't provide a SQ_SWAP_2_BYTES macro, so open code it for now.... =============== Diff against VMMaker.oscog-eem.1756 =============== Item was added: + ----- Method: CCodeGenerator>>generateByteSwap32:on:indent: (in category 'C translation') ----- + generateByteSwap32: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: #'SQ_SWAP_4_BYTES'. + aStream nextPut: $(. + self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! Item was added: + ----- Method: CCodeGenerator>>generateByteSwap64:on:indent: (in category 'C translation') ----- + generateByteSwap64: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: #'SQ_SWAP_8_BYTES'. + aStream nextPut: $(. + self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation support') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #abs #generateAbs:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #>>> #generateSignedShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert:on:indent: #bitInvert64 #generateBitInvert:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: + #byteSwap32 #generateByteSwap32:on:indent: + #byteSwap64 #generateByteSwap64:on:indent: + #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #timesRepeat: #generateTimesRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress:on:indent: #signedIntFromLong64 #generateSignedIntFromLong64:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToLong64 #generateSignedIntToLong64:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asUnsignedLongLong #generateAsUnsignedLongLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #allMask: #generateAllMask:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #minSmallInteger #generateSmallIntegerConstant:on:indent: #maxSmallInteger #generateSmallIntegerConstant:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #value:value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: CogVMSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "CogVMSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize dataSize count oldBaseAddr bytesToShift swapBytes headerFlags firstSegSize heapSize hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize hdrCogCodeSize stackZoneSize methodCacheSize primTraceLogSize allocationReserve | "open image file and read the header" f := FileStream readOnlyFileNamed: fileName. f ifNil: [^self error: 'no image found']. "Set the image name and the first argument; there are no arguments during simulation unless set explicitly." systemAttributes at: 1 put: fileName; at: 2 put: nil. ["begin ensure block..." imageName := f fullName. f binary. version := self getWord32FromFile: f swap: false. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] + ifFalse: [(version := version byteSwap32) = self imageFormatVersion - ifFalse: [(version := objectMemory byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getWord32FromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getWord32FromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. stackZoneSize := self computeStackZoneSize. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [cogit defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. desiredCogCodeSize := hdrCogCodeSize. self assert: f position = (objectMemory wordSize = 4 ifTrue: [40] ifFalse: [64]). hdrEdenBytes := self getWord32FromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = (objectMemory wordSize = 4 ifTrue: [48] ifFalse: [72]). firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "For Open PICs to be able to probe the method cache during simulation the methodCache must be relocated to memory." methodCacheSize := methodCache size * objectMemory wordSize. primTraceLogSize := primTraceLog size * objectMemory wordSize. "allocate interpreter memory. This list is in address order, low to high. In the actual VM the stack zone exists on the C stack." heapBase := (Cogit guardPageSize + cogCodeSize + stackZoneSize + methodCacheSize + primTraceLogSize + self rumpCStackSize) roundUpTo: objectMemory allocationUnit. "compare memory requirements with availability" allocationReserve := self interpreterAllocationReserveBytes. objectMemory hasSpurMemoryManagerAPI ifTrue: [| freeOldSpaceInImage headroom | freeOldSpaceInImage := self getLongFromFile: f swap: swapBytes. headroom := objectMemory initialHeadroom: extraVMMemory givenFreeOldSpaceInImage: freeOldSpaceInImage. heapSize := objectMemory roundUpHeapSize: dataSize + headroom + objectMemory newSpaceBytes + (headroom > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])] ifFalse: [heapSize := dataSize + extraBytes + objectMemory newSpaceBytes + (extraBytes > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])]. heapBase := objectMemory setHeapBase: heapBase memoryLimit: heapBase + heapSize endOfMemory: heapBase + dataSize. self assert: cogCodeSize \\ 4 = 0. self assert: objectMemory memoryLimit \\ 4 = 0. self assert: self rumpCStackSize \\ 4 = 0. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. objectMemory memory: ((cogit processor endianness == #little ifTrue: [LittleEndianBitmap] ifFalse: [Bitmap]) new: objectMemory memoryLimit // 4). count := objectMemory readHeapFromImageFile: f dataBytes: dataSize. count ~= dataSize ifTrue: [self halt]. ] ensure: [f close]. self moveMethodCacheToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize. self movePrimTraceLogToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize + methodCacheSize. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]. self initializeCodeGenerator! Item was added: + ----- Method: Integer>>byteSwap32 (in category '*VMMaker-bit manipulation') ----- + byteSwap32 + "swap the bytes of a 32 bit unsigned integer" + + ^((self << 24) bitAnd: 16rFF000000) bitOr: + (((self << 8) bitAnd: 16rFF0000) bitOr: + (((self >> 8) bitAnd: 16rFF00) bitOr: + (((self >> 24) bitAnd: 16rFF))))! Item was added: + ----- Method: Integer>>byteSwap64 (in category '*VMMaker-bit manipulation') ----- + byteSwap64 + "swap the bytes of a 64 bit unsigned integer" + + ^(((self << 56) bitAnd: 16rFF00000000000000) bitOr: + (((self << 40) bitAnd: 16rFF000000000000) bitOr: + (((self << 24) bitAnd: 16rFF0000000000) bitOr: + (((self << 8) bitAnd: 16rFF00000000) bitOr: + (((self >> 8) bitAnd: 16rFF000000) bitOr: + (((self >> 24) bitAnd: 16rFF0000) bitOr: + (((self >> 40) bitAnd: 16rFF00) bitOr: + ((self >> 56) bitAnd: 16rFF))))))))! Item was changed: ----- Method: Interpreter>>wordSwapped: (in category 'image save/restore') ----- wordSwapped: w "Return the given 64-bit integer with its halves in the reverse order." self wordSize = 8 ifFalse: [self error: 'This cannot happen.']. + ^ ((w >> 32) bitAnd: 16r00000000FFFFFFFF) bitOr: + ((w << 32) bitAnd: 16rFFFFFFFF00000000) - ^ ((w bitShift: Byte4ShiftNegated) bitAnd: Bytes3to0Mask) - + ((w bitShift: Byte4Shift ) bitAnd: Bytes7to4Mask) ! Item was changed: ----- Method: InterpreterPrimitives>>magnitude64BitIntegerFor:neg: (in category 'primitive support') ----- magnitude64BitIntegerFor: magnitude neg: isNegative "Return a Large Integer object for the given integer magnitude and sign" | newLargeInteger largeClass highWord sz isSmall smallVal | <var: 'magnitude' type: #usqLong> <var: 'highWord' type: #usqInt> isSmall := isNegative ifTrue: [magnitude <= (objectMemory maxSmallInteger + 1)] ifFalse: [magnitude <= objectMemory maxSmallInteger]. isSmall ifTrue: [smallVal := self cCoerceSimple: magnitude to: #sqInt. isNegative ifTrue: [smallVal := 0 - smallVal]. ^objectMemory integerObjectOf: smallVal]. largeClass := isNegative ifTrue: [objectMemory classLargeNegativeInteger] ifFalse: [objectMemory classLargePositiveInteger]. objectMemory wordSize = 8 ifTrue: [sz := 8] ifFalse: [(highWord := magnitude >> 32) = 0 ifTrue: [sz := 4] ifFalse: [sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]]]]]. newLargeInteger := objectMemory instantiateClass: largeClass indexableSize: sz. self cppIf: VMBIGENDIAN ifTrue: + [sz > 4 + ifTrue: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: magnitude byteSwap64] + ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (magnitude byteSwap32)]] - [sz > 4 ifTrue: - [objectMemory - storeByte: 7 ofObject: newLargeInteger withValue: (magnitude >> 56 bitAnd: 16rFF); - storeByte: 6 ofObject: newLargeInteger withValue: (magnitude >> 48 bitAnd: 16rFF); - storeByte: 5 ofObject: newLargeInteger withValue: (magnitude >> 40 bitAnd: 16rFF); - storeByte: 4 ofObject: newLargeInteger withValue: (magnitude >> 32 bitAnd: 16rFF)]. - objectMemory - storeByte: 3 ofObject: newLargeInteger withValue: (magnitude >> 24 bitAnd: 16rFF); - storeByte: 2 ofObject: newLargeInteger withValue: (magnitude >> 16 bitAnd: 16rFF); - storeByte: 1 ofObject: newLargeInteger withValue: (magnitude >> 8 bitAnd: 16rFF); - storeByte: 0 ofObject: newLargeInteger withValue: (magnitude ">> 0" bitAnd: 16rFF)] ifFalse: [sz > 4 ifTrue: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: magnitude] ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (self cCode: [magnitude] inSmalltalk: [magnitude bitAnd: 16rFFFFFFFF])]]. ^newLargeInteger! Item was changed: ----- Method: InterpreterPrimitives>>magnitude64BitValueOf: (in category 'primitive support') ----- magnitude64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or an eight-byte LargeInteger." | sz value ok smallIntValue | <returnTypeC: #usqLong> <var: #value type: #usqLong> (objectMemory isIntegerObject: oop) ifTrue: [smallIntValue := (objectMemory integerValueOf: oop). smallIntValue < 0 ifTrue: [smallIntValue := 0 - smallIntValue]. ^self cCoerce: smallIntValue to: #usqLong]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifFalse: [ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]]. sz := objectMemory numBytesOfBytes: oop. sz > (self sizeof: #sqLong) ifTrue: [self primitiveFail. ^0]. self cppIf: VMBIGENDIAN ifTrue: + [sz > 4 + ifTrue: [value := (self cCoerceSimple: (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong) byteSwap64] + ifFalse: [value := (self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') byteSwap32].] - [value := objectMemory fetchByte: sz - 1 ofObject: oop. - sz - 2 to: 0 by: -1 do: - [:i | value := value << 8 + (objectMemory fetchByte: i ofObject: oop)]] ifFalse: [sz > 4 ifTrue: [value := self cCoerceSimple: (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong] ifFalse: [value := self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int'].]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>positive32BitValueOf: (in category 'primitive support') ----- positive32BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a four-byte LargePositiveInteger." <returnTypeC: #usqInt> | value ok sz | (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop. (value < 0 or: [objectMemory wordSize > 4 and: [self cCode: [(self cCoerceSimple: value to: #'unsigned int') ~= value] inSmalltalk: [value >> 32 ~= 0]]]) ifTrue: [self primitiveFail. value := 0]. ^value]. (objectMemory hasSixtyFourBitImmediates or: [objectMemory isNonIntegerImmediate: oop]) ifTrue: [self primitiveFail. ^0] ifFalse: [ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]. sz := objectMemory numBytesOfBytes: oop. sz > 4 ifTrue: [self primitiveFail. ^0]. ^self cppIf: VMBIGENDIAN ifTrue: + [(objectMemory fetchLong32: 0 ofObject: oop) byteSwap32] - [ (objectMemory fetchByte: 0 ofObject: oop) - + ((objectMemory fetchByte: 1 ofObject: oop) << 8) - + ((objectMemory fetchByte: 2 ofObject: oop) << 16) - + ((objectMemory fetchByte: 3 ofObject: oop) << 24)] ifFalse: [objectMemory fetchLong32: 0 ofObject: oop]]! Item was changed: ----- Method: InterpreterPrimitives>>positive64BitValueOf: (in category 'primitive support') ----- positive64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or an eight-byte LargePositiveInteger." <returnTypeC: #usqLong> | sz value ok | <var: #value type: #usqLong> (objectMemory isIntegerObject: oop) ifTrue: [(objectMemory integerValueOf: oop) < 0 ifTrue: [^self primitiveFail]. ^objectMemory integerValueOf: oop]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]. sz := objectMemory numBytesOfBytes: oop. sz > (self sizeof: #sqLong) ifTrue: [self primitiveFail. ^0]. self cppIf: VMBIGENDIAN ifTrue: + [sz > 4 + ifTrue: [value := (self cCoerceSimple: (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong) byteSwap64] + ifFalse: [value := (self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') byteSwap32].] - [value := 0. - 0 to: sz - 1 do: [:i | - value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #usqLong) << (i*8))]] ifFalse: [sz > 4 ifTrue: [value := self cCoerceSimple: (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong] ifFalse: [value := self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int'].]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>positiveMachineIntegerValueOf: (in category 'primitive support') ----- positiveMachineIntegerValueOf: oop "Answer a value of an integer in address range, i.e up to the size of a machine word. The object may be either a positive SmallInteger or a LargePositiveInteger of size <= word size." <returnTypeC: #'unsigned long'> <inline: true> "only two callers & one is primitiveNewWithArg" | value bs ok | (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop. value < 0 ifTrue: [^self primitiveFail]. ^value]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]. bs := objectMemory numBytesOfBytes: oop. bs > (self sizeof: #'unsigned long') ifTrue: [self primitiveFail. ^0]. ((self sizeof: #'unsigned long') = 8 and: [bs > 4]) ifTrue: [^self cppIf: VMBIGENDIAN ifTrue: + [(objectMemory fetchLong64: 0 ofObject: oop) byteSwap64] - [ (objectMemory fetchByte: 0 ofObject: oop) - + ((objectMemory fetchByte: 1 ofObject: oop) << 8) - + ((objectMemory fetchByte: 2 ofObject: oop) << 16) - + ((objectMemory fetchByte: 3 ofObject: oop) << 24) - + ((objectMemory fetchByte: 4 ofObject: oop) << 32) - + ((objectMemory fetchByte: 5 ofObject: oop) << 40) - + ((objectMemory fetchByte: 6 ofObject: oop) << 48) - + ((objectMemory fetchByte: 7 ofObject: oop) << 56)] ifFalse: [objectMemory fetchLong64: 0 ofObject: oop]] ifFalse: [^self cppIf: VMBIGENDIAN ifTrue: + [(self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') byteSwap32] - [ (objectMemory fetchByte: 0 ofObject: oop) - + ((objectMemory fetchByte: 1 ofObject: oop) << 8) - + ((objectMemory fetchByte: 2 ofObject: oop) << 16) - + ((objectMemory fetchByte: 3 ofObject: oop) << 24)] ifFalse: [self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int']]! Item was changed: ----- Method: InterpreterPrimitives>>signed32BitValueOf: (in category 'primitive support') ----- signed32BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a four-byte LargeInteger." | value negative ok magnitude | <inline: false> <returnTypeC: #int> <var: #value type: #int> <var: #magnitude type: #'unsigned int'> <var: #value64 type: #long> (objectMemory isIntegerObject: oop) ifTrue: [objectMemory wordSize = 4 ifTrue: [^objectMemory integerValueOf: oop] ifFalse: "Must fail for SmallIntegers with digitLength > 4" [| value64 | value64 := objectMemory integerValueOf: oop. (self cCode: [(self cCoerceSimple: value64 to: #int) ~= value64] inSmalltalk: [value64 >> 31 ~= 0 and: [value64 >> 31 ~= -1]]) ifTrue: [self primitiveFail. value64 := 0]. ^value64]]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]]. (objectMemory numBytesOfBytes: oop) > 4 ifTrue: [^self primitiveFail]. magnitude := self cppIf: VMBIGENDIAN ifTrue: + [(objectMemory fetchLong32: 0 ofObject: oop) asUnsignedInteger byteSwap32] - [ (objectMemory fetchByte: 0 ofObject: oop) + - ((objectMemory fetchByte: 1 ofObject: oop) << 8) + - ((objectMemory fetchByte: 2 ofObject: oop) << 16) + - ((objectMemory fetchByte: 3 ofObject: oop) << 24)] ifFalse: [(objectMemory fetchLong32: 0 ofObject: oop) asUnsignedInteger]. (negative ifTrue: [magnitude > 16r80000000] ifFalse: [magnitude >= 16r80000000]) ifTrue: [self primitiveFail. ^0]. negative ifTrue: [value := 0 - magnitude] ifFalse: [value := magnitude]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>signed64BitValueOf: (in category 'primitive support') ----- signed64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a eight-byte LargeInteger." | sz value negative ok magnitude | <inline: false> <returnTypeC: #sqLong> <var: #value type: #sqLong> <var: #magnitude type: #usqLong> (objectMemory isIntegerObject: oop) ifTrue: [^self cCoerce: (objectMemory integerValueOf: oop) to: #sqLong]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]]. sz := objectMemory numBytesOfBytes: oop. sz > (self sizeof: #sqLong) ifTrue: [self primitiveFail. ^0]. self cppIf: VMBIGENDIAN ifTrue: + [magnitude := sz > 4 + ifTrue: [(objectMemory fetchLong64: 0 ofObject: oop) byteSwap64] + ifFalse: [(self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') byteSwap32]] - [magnitude := objectMemory fetchByte: sz - 1 ofObject: oop. - sz - 2 to: 0 by: -1 do: [:i | - magnitude := magnitude << 8 + (objectMemory fetchByte: i ofObject: oop)]] ifFalse: [magnitude := sz > 4 ifTrue: [objectMemory fetchLong64: 0 ofObject: oop] ifFalse: [self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int']]. (negative ifTrue: [magnitude > 16r8000000000000000] ifFalse: [magnitude >= 16r8000000000000000]) ifTrue: [self primitiveFail. ^0]. negative ifTrue: [value := 0 - magnitude] ifFalse: [value := magnitude]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>signedMachineIntegerValueOf: (in category 'primitive support') ----- signedMachineIntegerValueOf: oop "Answer a signed value of an integer up to the size of a machine word. The object may be either a positive SmallInteger or a LargeInteger of size <= word size." <returnTypeC: #'long'> | negative ok bs value limit magnitude | <var: #value type: #long> <var: #magnitude type: #usqInt> <var: #limit type: #usqInt> (objectMemory isIntegerObject: oop) ifTrue: [^objectMemory integerValueOf: oop]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [^self primitiveFail]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [^self primitiveFail]]. bs := objectMemory numBytesOf: oop. bs > (self sizeof: #'unsigned long') ifTrue: [^self primitiveFail]. ((self sizeof: #'unsigned long') = 8 and: [bs > 4]) ifTrue: [magnitude := self cppIf: VMBIGENDIAN ifTrue: + [(objectMemory fetchLong64: 0 ofObject: oop) byteSwap64] - [ (objectMemory fetchByte: 0 ofObject: oop) - + ((objectMemory fetchByte: 1 ofObject: oop) << 8) - + ((objectMemory fetchByte: 2 ofObject: oop) << 16) - + ((objectMemory fetchByte: 3 ofObject: oop) << 24) - + ((objectMemory fetchByte: 4 ofObject: oop) << 32) - + ((objectMemory fetchByte: 5 ofObject: oop) << 40) - + ((objectMemory fetchByte: 6 ofObject: oop) << 48) - + ((objectMemory fetchByte: 7 ofObject: oop) << 56)] ifFalse: [objectMemory fetchLong64: 0 ofObject: oop]] ifFalse: [magnitude := self cppIf: VMBIGENDIAN ifTrue: + [(objectMemory fetchLong32: 0 ofObject: oop) asUnsignedInteger byteSwap32] - [ (objectMemory fetchByte: 0 ofObject: oop) - + ((objectMemory fetchByte: 1 ofObject: oop) << 8) - + ((objectMemory fetchByte: 2 ofObject: oop) << 16) - + ((objectMemory fetchByte: 3 ofObject: oop) << 24)] ifFalse: [(objectMemory fetchLong32: 0 ofObject: oop) asUnsignedInteger]]. limit := 1 asUnsignedInteger << ((self sizeof: #usqInt) * 8 - 1). (negative ifTrue: [magnitude > limit] ifFalse: [magnitude >= limit]) ifTrue: [self primitiveFail. ^0]. negative ifTrue: [value := 0 - magnitude] ifFalse: [value := magnitude]. ^value! Item was changed: ----- Method: InterpreterSimulatorMSB64>>byteSwapped: (in category 'memory access') ----- byteSwapped: w "Return the given integer with its bytes in the reverse order." + ^w byteSwap64! - ^ (super byteSwapped: ((w bitShift: -32) bitAnd: 16rFFFFFFFF)) + - ((super byteSwapped: (w bitAnd: 16rFFFFFFFF)) bitShift: 32)! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitSub:len:with:len:into: (in category 'C core') ----- cDigitSub: pByteSmall len: smallLen with: pByteLarge len: largeLen into: pByteRes | z | <var: #pByteSmall type: #'unsigned char *'> <var: #pByteLarge type: #'unsigned char *'> <var: #pByteRes type: #'unsigned char *'> + <var: #z type: #'unsigned int'> z := 0. "Loop invariant is -1<=z<=1" 0 to: smallLen - 1 do: [:i | z := z + (pByteLarge at: i) - (pByteSmall at: i). pByteRes at: i put: (self cCode: [z] inSmalltalk: [z bitAnd: 255]). z := z signedBitShift: -8]. smallLen to: largeLen - 1 do: [:i | z := z + (pByteLarge at: i) . pByteRes at: i put: (self cCode: [z] inSmalltalk: [z bitAnd: 255]). z := z signedBitShift: -8]. ! Item was changed: ----- Method: ObjectMemory class>>initBytesPerWord: (in category 'initialization') ----- initBytesPerWord: nBytes BytesPerWord := nBytes. - "The following is necessary to avoid confusing the compiler with shifts that are larger than the width of the type on which they operate. In gcc, such shifts cause incorrect code to be generated." - BytesPerWord = 8 - ifTrue: "64-bit VM" - [Byte0Mask := 16r00000000000000FF. Byte0Shift := 0. - Byte1Mask := 16r000000000000FF00. Byte1Shift := 8. - Byte2Mask := 16r0000000000FF0000. Byte2Shift := 16. - Byte3Mask := 16r00000000FF000000. Byte3Shift := 24. - Byte4Mask := 16r000000FF00000000. Byte4Shift := 32. - Byte5Mask := 16r0000FF0000000000. Byte5Shift := 40. - Byte6Mask := 16r00FF000000000000. Byte6Shift := 48. - Byte7Mask := 16rFF00000000000000. Byte7Shift := 56. - Bytes3to0Mask := 16r00000000FFFFFFFF. - Bytes7to4Mask := 16rFFFFFFFF00000000] - ifFalse: "32-bit VM" - [Byte0Mask := 16r00000000000000FF. Byte0Shift := 0. - Byte1Mask := 16r000000000000FF00. Byte1Shift := 8. - Byte2Mask := 16r0000000000FF0000. Byte2Shift := 16. - Byte3Mask := 16r00000000FF000000. Byte3Shift := 24. - Byte4Mask := 16r0000000000000000. Byte4Shift := 0. "unused" - Byte5Mask := 16r0000000000000000. Byte5Shift := 0. "unused" - Byte6Mask := 16r0000000000000000. Byte6Shift := 0. "unused" - Byte7Mask := 16r0000000000000000. Byte7Shift := 0. "unused" - Bytes3to0Mask := 16r0000000000000000. "unused" - Bytes7to4Mask := 16r0000000000000000 "unused"]. - Byte1ShiftNegated := Byte1Shift negated. - Byte3ShiftNegated := Byte3Shift negated. - Byte4ShiftNegated := Byte4Shift negated. - Byte5ShiftNegated := Byte5Shift negated. - Byte7ShiftNegated := Byte7Shift negated. "N.B. This is *not* output when generating the interpreter file. It is left to the various sqConfig.h files to define correctly." VMBIGENDIAN := Smalltalk endianness == #big! Item was changed: ----- Method: ObjectMemory>>byteSwapped: (in category 'image save/restore') ----- byteSwapped: w "Answer the given integer with its bytes in the reverse order." <api> <returnTypeC: #sqInt> self cppIf: self wordSize = 4 + ifTrue: [^w byteSwap32] + ifFalse: [^w byteSwap64]! - ifTrue: - [^ ((w bitShift: Byte3ShiftNegated) bitAnd: Byte0Mask) - + ((w bitShift: Byte1ShiftNegated) bitAnd: Byte1Mask) - + ((w bitShift: Byte1Shift ) bitAnd: Byte2Mask) - + ((w bitShift: Byte3Shift ) bitAnd: Byte3Mask)] - ifFalse: - [^ ((w bitShift: Byte7ShiftNegated) bitAnd: Byte0Mask) - + ((w bitShift: Byte5ShiftNegated) bitAnd: Byte1Mask) - + ((w bitShift: Byte3ShiftNegated) bitAnd: Byte2Mask) - + ((w bitShift: Byte1ShiftNegated) bitAnd: Byte3Mask) - + ((w bitShift: Byte1Shift ) bitAnd: Byte4Mask) - + ((w bitShift: Byte3Shift ) bitAnd: Byte5Mask) - + ((w bitShift: Byte5Shift ) bitAnd: Byte6Mask) - + ((w bitShift: Byte7Shift ) bitAnd: Byte7Mask)]! Item was removed: - ----- Method: Spur32BitMemoryManager>>byteSwapped32Bits: (in category 'snapshot') ----- - byteSwapped32Bits: w - ^self byteSwapped: w! Item was changed: ----- Method: Spur32BitMemoryManager>>byteSwapped: (in category 'snapshot') ----- byteSwapped: w "Answer the given integer with its bytes in the reverse order." <api> <returnTypeC: #sqInt> + ^w byteSwap32! - ^ ((w bitShift: Byte3ShiftNegated) bitAnd: Byte0Mask) - + ((w bitShift: Byte1ShiftNegated) bitAnd: Byte1Mask) - + ((w bitShift: Byte1Shift ) bitAnd: Byte2Mask) - + ((w bitShift: Byte3Shift ) bitAnd: Byte3Mask)! Item was removed: - ----- Method: Spur64BitMemoryManager>>byteSwapped32Bits: (in category 'snapshot') ----- - byteSwapped32Bits: w - "Answer the given 32-bit integer with its bytes in the reverse order." - ^ ((w bitShift: Byte3ShiftNegated) bitAnd: Byte0Mask) - + ((w bitShift: Byte1ShiftNegated) bitAnd: Byte1Mask) - + ((w bitShift: Byte1Shift ) bitAnd: Byte2Mask) - + ((w bitShift: Byte3Shift ) bitAnd: Byte3Mask)! Item was changed: ----- Method: Spur64BitMemoryManager>>byteSwapped: (in category 'snapshot') ----- byteSwapped: w "Answer the given integer with its bytes in the reverse order." <api> <returnTypeC: #sqInt> + ^w byteSwap64! - ^ ((w bitShift: Byte7ShiftNegated) bitAnd: Byte0Mask) - + ((w bitShift: Byte5ShiftNegated) bitAnd: Byte1Mask) - + ((w bitShift: Byte3ShiftNegated) bitAnd: Byte2Mask) - + ((w bitShift: Byte1ShiftNegated) bitAnd: Byte3Mask) - + ((w bitShift: Byte1Shift ) bitAnd: Byte4Mask) - + ((w bitShift: Byte3Shift ) bitAnd: Byte5Mask) - + ((w bitShift: Byte5Shift ) bitAnd: Byte6Mask) - + ((w bitShift: Byte7Shift ) bitAnd: Byte7Mask)! Item was changed: ----- Method: SpurMemoryManager class>>initBytesPerWord: (in category 'class initialization') ----- initBytesPerWord: wordSize BytesPerWord := BytesPerOop := wordSize. - "The following is necessary to avoid confusing the compiler with shifts that are larger than the width of the type on which they operate. In gcc, such shifts cause incorrect code to be generated." - BytesPerWord = 8 - ifTrue: "64-bit VM" - [Byte0Mask := 16r00000000000000FF. Byte0Shift := 0. - Byte1Mask := 16r000000000000FF00. Byte1Shift := 8. - Byte2Mask := 16r0000000000FF0000. Byte2Shift := 16. - Byte3Mask := 16r00000000FF000000. Byte3Shift := 24. - Byte4Mask := 16r000000FF00000000. Byte4Shift := 32. - Byte5Mask := 16r0000FF0000000000. Byte5Shift := 40. - Byte6Mask := 16r00FF000000000000. Byte6Shift := 48. - Byte7Mask := 16rFF00000000000000. Byte7Shift := 56. - Bytes3to0Mask := 16r00000000FFFFFFFF. - Bytes7to4Mask := 16rFFFFFFFF00000000] - ifFalse: "32-bit VM" - [Byte0Mask := 16r00000000000000FF. Byte0Shift := 0. - Byte1Mask := 16r000000000000FF00. Byte1Shift := 8. - Byte2Mask := 16r0000000000FF0000. Byte2Shift := 16. - Byte3Mask := 16r00000000FF000000. Byte3Shift := 24. - Byte4Mask := nil. Byte4Shift := 0. "unused" - Byte5Mask := nil. Byte5Shift := 0. "unused" - Byte6Mask := nil. Byte6Shift := 0. "unused" - Byte7Mask := nil. Byte7Shift := 0. "unused" - Bytes3to0Mask := nil. "unused" - Bytes7to4Mask := nil "unused"]. - Byte1ShiftNegated := Byte1Shift negated. - Byte3ShiftNegated := Byte3Shift negated. - Byte4ShiftNegated := Byte4Shift negated. - Byte5ShiftNegated := Byte5Shift negated. - Byte7ShiftNegated := Byte7Shift negated. "N.B. This is *not* output when generating the interpreter file. It is left to the various sqConfig.h files to define correctly." VMBIGENDIAN := Smalltalk endianness == #big! Item was removed: - ----- Method: SpurMemoryManager>>byteSwapped32Bits: (in category 'snapshot') ----- - byteSwapped32Bits: w - self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>reverseBytesIn32BitWordsFrom:to: (in category 'snapshot') ----- reverseBytesIn32BitWordsFrom: startAddr to: stopAddr "Byte-swap the given range of memory (not inclusive of stopAddr!!)." | addr | addr := startAddr. [self oop: addr isLessThan: stopAddr] whileTrue: + [self long32At: addr put: ((self long32At: addr) byteSwap32). - [self long32At: addr put: (self byteSwapped32Bits: (self long32At: addr)). addr := addr + 4]! Item was changed: ----- Method: StackInterpreter>>getShortFromFile:swap: (in category 'image save/restore') ----- getShortFromFile: aFile swap: swapFlag "Answer the next 16 bit word read from aFile, byte-swapped according to the swapFlag." <var: #aFile type: #sqImageFile> | w | + <var: #w type: #'unsigned short'> - <var: #w type: #short> w := 0. self cCode: [self sq: (self addressOf: w) + Image: (self sizeof: #'unsigned short') - Image: (self sizeof: #short) File: 1 Read: aFile] inSmalltalk: [w := objectMemory nextShortFrom: aFile]. ^swapFlag + ifTrue: [((w >> 8) bitAnd: 16rFF) bitOr: ((w bitAnd: 16rFF) << 8)] - ifTrue: [objectMemory byteSwapped: w] ifFalse: [w]! Item was changed: ----- Method: StackInterpreter>>getWord32FromFile:swap: (in category 'image save/restore') ----- getWord32FromFile: aFile swap: swapFlag "Answer the next 32 bit word read from aFile, byte-swapped according to the swapFlag." <var: #aFile type: #sqImageFile> | w | <var: #w type: #int> w := 0. self cCode: [self sq: (self addressOf: w) Image: (self sizeof: #int) File: 1 Read: aFile] inSmalltalk: [w := objectMemory nextWord32From: aFile]. ^swapFlag + ifTrue: [w byteSwap32] - ifTrue: [objectMemory byteSwapped: w] ifFalse: [w]! Item was changed: ----- Method: StackInterpreter>>maybeInlinePositive32BitIntegerFor: (in category 'primitive support') ----- maybeInlinePositive32BitIntegerFor: integerValue "N.B. will *not* cause a GC. integerValue is interpreted as POSITIVE, e.g. as the result of Bitmap>at:." <notOption: #Spur64BitMemoryManager> <var: 'integerValue' type: #'unsigned int'> | newLargeInteger | self deny: objectMemory hasSixtyFourBitImmediates. "force coercion because slang inliner sometimes incorrectly pass a signed int without converting to unsigned" (self cCode: [self cCoerceSimple: integerValue to: #'unsigned int'] inSmalltalk: [integerValue bitAnd: 1 << 32 - 1]) <= objectMemory maxSmallInteger ifTrue: [^objectMemory integerObjectOf: integerValue]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: ClassLargePositiveIntegerCompactIndex format: (objectMemory byteFormatForNumBytes: 4) numSlots: 1. self cppIf: VMBIGENDIAN ifTrue: + [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: integerValue byteSwap32] - [objectMemory - storeByte: 3 ofObject: newLargeInteger withValue: (integerValue >> 24 bitAnd: 16rFF); - storeByte: 2 ofObject: newLargeInteger withValue: (integerValue >> 16 bitAnd: 16rFF); - storeByte: 1 ofObject: newLargeInteger withValue: (integerValue >> 8 bitAnd: 16rFF); - storeByte: 0 ofObject: newLargeInteger withValue: (integerValue ">> 0" bitAnd: 16rFF)] ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: integerValue]. ^newLargeInteger! Item was changed: ----- Method: StackInterpreter>>noInlineSigned32BitIntegerFor: (in category 'primitive support') ----- noInlineSigned32BitIntegerFor: integerValue "Answer a full 32 bit integer object for the given integer value." <notOption: #Spur64BitMemoryManager> | newLargeInteger value largeClass | <inline: false> (objectMemory isIntegerValue: integerValue) ifTrue: [^objectMemory integerObjectOf: integerValue]. self deny: objectMemory hasSixtyFourBitImmediates. integerValue < 0 ifTrue: [largeClass := ClassLargeNegativeIntegerCompactIndex. value := 0 - integerValue] ifFalse: [largeClass := ClassLargePositiveIntegerCompactIndex. value := integerValue]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: largeClass format: (objectMemory byteFormatForNumBytes: 4) numSlots: 1. self cppIf: VMBIGENDIAN ifTrue: + [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: value byteSwap32] - [objectMemory - storeByte: 3 ofObject: newLargeInteger withValue: ((value >> 24) bitAnd: 16rFF); - storeByte: 2 ofObject: newLargeInteger withValue: ((value >> 16) bitAnd: 16rFF); - storeByte: 1 ofObject: newLargeInteger withValue: ((value >> 8) bitAnd: 16rFF); - storeByte: 0 ofObject: newLargeInteger withValue: (value bitAnd: 16rFF)] ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: value]. ^newLargeInteger! Item was changed: ----- Method: StackInterpreter>>positive64BitIntegerFor: (in category 'primitive support') ----- positive64BitIntegerFor: integerValue <api> <var: 'integerValue' type: #usqLong> <var: 'highWord' type: #'unsigned int'> "Answer a Large Positive Integer object for the given integer value. N.B. will *not* cause a GC." | newLargeInteger highWord sz | objectMemory hasSixtyFourBitImmediates ifTrue: [(self cCode: [integerValue] inSmalltalk: [integerValue bitAnd: 1 << 64 - 1]) <= objectMemory maxSmallInteger ifTrue: [^objectMemory integerObjectOf: integerValue]. sz := 8] ifFalse: [(highWord := integerValue >> 32) = 0 ifTrue: [^self positive32BitIntegerFor: integerValue]. sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1]]]]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: ClassLargePositiveIntegerCompactIndex format: (objectMemory byteFormatForNumBytes: sz) numSlots: 8 / objectMemory bytesPerOop. self cppIf: VMBIGENDIAN ifTrue: + [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: integerValue byteSwap64] - [objectMemory - storeByte: 7 ofObject: newLargeInteger withValue: (integerValue >> 56 bitAnd: 16rFF); - storeByte: 6 ofObject: newLargeInteger withValue: (integerValue >> 48 bitAnd: 16rFF); - storeByte: 5 ofObject: newLargeInteger withValue: (integerValue >> 40 bitAnd: 16rFF); - storeByte: 4 ofObject: newLargeInteger withValue: (integerValue >> 32 bitAnd: 16rFF); - storeByte: 3 ofObject: newLargeInteger withValue: (integerValue >> 24 bitAnd: 16rFF); - storeByte: 2 ofObject: newLargeInteger withValue: (integerValue >> 16 bitAnd: 16rFF); - storeByte: 1 ofObject: newLargeInteger withValue: (integerValue >> 8 bitAnd: 16rFF); - storeByte: 0 ofObject: newLargeInteger withValue: (integerValue ">> 0" bitAnd: 16rFF)] ifFalse: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: integerValue]. ^newLargeInteger ! Item was changed: ----- Method: StackInterpreter>>signed64BitIntegerFor: (in category 'primitive support') ----- signed64BitIntegerFor: integerValue <var: 'integerValue' type: #sqLong> "Answer a Large Integer object for the given integer value. N.B. will *not* cause a GC." | newLargeInteger magnitude largeClass highWord sz | <inline: false> <var: 'magnitude' type: #usqLong> <var: 'highWord' type: #usqInt> integerValue < 0 ifTrue:[ integerValue >= objectMemory minSmallInteger ifTrue: [^objectMemory integerObjectOf: integerValue asInteger]. largeClass := ClassLargeNegativeIntegerCompactIndex. magnitude := 0 - (self cCoerceSimple: integerValue to: #usqLong)] ifFalse:[ integerValue <= objectMemory maxSmallInteger ifTrue: [^objectMemory integerObjectOf: integerValue asInteger]. largeClass := ClassLargePositiveIntegerCompactIndex. magnitude := integerValue]. objectMemory wordSize = 8 ifTrue: [sz := 8] ifFalse: [ (highWord := magnitude >> 32) = 0 ifTrue: [sz := 4] ifFalse: [sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]]]]]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: largeClass format: (objectMemory byteFormatForNumBytes: sz) numSlots: sz + 3 // objectMemory bytesPerOop. self cppIf: VMBIGENDIAN ifTrue: + [sz > 4 + ifTrue: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: magnitude byteSwap64] + ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: magnitude byteSwap32]] - [sz > 4 ifTrue: - [objectMemory - storeByte: 7 ofObject: newLargeInteger withValue: (magnitude >> 56 bitAnd: 16rFF); - storeByte: 6 ofObject: newLargeInteger withValue: (magnitude >> 48 bitAnd: 16rFF); - storeByte: 5 ofObject: newLargeInteger withValue: (magnitude >> 40 bitAnd: 16rFF); - storeByte: 4 ofObject: newLargeInteger withValue: (magnitude >> 32 bitAnd: 16rFF)]. - objectMemory - storeByte: 3 ofObject: newLargeInteger withValue: (magnitude >> 24 bitAnd: 16rFF); - storeByte: 2 ofObject: newLargeInteger withValue: (magnitude >> 16 bitAnd: 16rFF); - storeByte: 1 ofObject: newLargeInteger withValue: (magnitude >> 8 bitAnd: 16rFF); - storeByte: 0 ofObject: newLargeInteger withValue: (magnitude ">> 0" bitAnd: 16rFF)] ifFalse: [sz > 4 ifTrue: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: magnitude] ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (self cCode: [magnitude] inSmalltalk: [magnitude bitAnd: 16rFFFFFFFF])]]. ^newLargeInteger! Item was changed: ----- Method: StackInterpreter>>wordSwapped: (in category 'image save/restore') ----- wordSwapped: w "Return the given 64-bit integer with its halves in the reverse order." objectMemory wordSize = 8 ifFalse: [self error: 'This cannot happen.']. + ^ ((w >> 32) bitAnd: 16r00000000FFFFFFFF) bitOr: + ((w << 32) bitAnd: 16rFFFFFFFF00000000) - ^ ((w bitShift: Byte4ShiftNegated) bitAnd: Bytes3to0Mask) - + ((w bitShift: Byte4Shift ) bitAnd: Bytes7to4Mask) ! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiCreateIntegralResultOop:ofAtomicType:in: (in category 'callout support') ----- ffiCreateIntegralResultOop: retVal ofAtomicType: atomicType in: calloutState <inline: true> <var: #calloutState type: #'CalloutState *'> <var: #retVal type: #usqLong> "Callout support. Return the appropriate oop for the given atomic type" | shift value mask byteSize | <var: 'value' type: #usqLong> <var: 'mask' type: #usqLong> self assert: atomicType < FFITypeSingleFloat. atomicType = FFITypeBool ifTrue: ["Make sure bool honors the byte size requested" byteSize := calloutState ffiRetHeader bitAnd: FFIStructSizeMask. value := byteSize = (self sizeof: retVal) ifTrue:[retVal] ifFalse:[retVal bitAnd: 1 << (byteSize * 8) - 1]. ^value = 0 ifTrue:[interpreterProxy falseObject] ifFalse:[interpreterProxy trueObject]]. atomicType <= FFITypeSignedInt ifTrue: ["these are all generall integer returns" atomicType <= (BytesPerWord = 8 ifTrue: [FFITypeSignedInt] ifFalse: [FFITypeSignedShort]) ifTrue: ["byte/short. first extract partial word, then sign extend" shift := (BytesPerWord = 8 and: [atomicType >= FFITypeUnsignedInt]) ifTrue: [32] ifFalse: [(atomicType >> 1) * 8]. "# of significant bits" value := retVal bitAnd: (1 asUnsignedLong << shift - 1). (atomicType anyMask: 1) ifTrue: ["make the guy signed" mask := 1 asUnsignedLong << (shift-1). value := (value bitAnd: mask-1) - (value bitAnd: mask)]. ^interpreterProxy integerObjectOf: value]. "Word sized integer return" ^(atomicType anyMask: 1) ifTrue:[interpreterProxy signedMachineIntegerFor: retVal] "signed return" ifFalse:[interpreterProxy positiveMachineIntegerFor: retVal]]. "unsigned return" "longlong, char" ^(atomicType >> 1) = (FFITypeSignedLongLong >> 1) ifTrue: [(atomicType anyMask: 1) ifTrue:[interpreterProxy signed64BitIntegerFor: retVal] "signed return" ifFalse:[interpreterProxy positive64BitIntegerFor: retVal]] ifFalse: + [interpreterProxy characterObjectOf: (retVal bitAnd: 16rFF)]! - [interpreterProxy characterObjectOf: (retVal bitAnd: Byte0Mask)]! Item was changed: SharedPool subclass: #VMBasicConstants instanceVariableNames: '' + classVariableNames: 'BaseHeaderSize BytesPerOop BytesPerWord COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks DoExpensiveAssertionChecks GCModeBecome GCModeFreeSpace GCModeFull GCModeImageSegment GCModeIncremental GCModeNewSpace IMMUTABILITY MULTIPLEBYTECODESETS NewspeakVM PharoVM PrimErrBadArgument PrimErrBadIndex PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound PrimErrObjectIsPinned PrimErrObjectMayMove PrimErrUnsupported PrimErrWritePastObject PrimNoErr SPURVM STACKVM SistaVM VMBIGENDIAN' - classVariableNames: 'BaseHeaderSize Byte0Mask Byte0Shift Byte1Mask Byte1Shift Byte1ShiftNegated Byte2Mask Byte2Shift Byte3Mask Byte3Shift Byte3ShiftNegated Byte4Mask Byte4Shift Byte4ShiftNegated Byte5Mask Byte5Shift Byte5ShiftNegated Byte6Mask Byte6Shift Byte7Mask Byte7Shift Byte7ShiftNegated Bytes3to0Mask Bytes7to4Mask BytesPerOop BytesPerWord COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks DoExpensiveAssertionChecks GCModeBecome GCModeFreeSpace GCModeFull GCModeImageSegment GCModeIncremental GCModeNewSpace IMMUTABILITY MULTIPLEBYTECODESETS NewspeakVM PharoVM PrimErrBadArgument PrimErrBadIndex PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound PrimErrObjectIsPinned PrimErrObjectMayMove PrimErrUnsupported PrimErrWritePastObject PrimNoErr SPURVM STACKVM SistaVM VMBIGENDIAN' poolDictionaries: '' category: 'VMMaker-Interpreter'! !VMBasicConstants commentStamp: '<historical>' prior: 0! I am a shared pool for basic constants upon which the VM as a whole depends. self ensureClassPool. self classPool declare: #BytesPerWord from: VMSqueakV3ObjectRepresentationConstants classPool. self classPool declare: #BaseHeaderSize from: VMSqueakV3ObjectRepresentationConstants classPool (ObjectMemory classPool keys select: [:k| k beginsWith: 'Byte']) do: [:k| self classPool declare: k from: ObjectMemory classPool]!

1 0

[commit][3667] Provide eventually accelerated macros for byte swapping
by commits＠squeakvm.org 02 Apr '16

02 Apr '16

Revision: 3667 Author: nice Date: 2016-04-02 14:58:22 -0700 (Sat, 02 Apr 2016) Log Message: ----------- Provide eventually accelerated macros for byte swapping Modified Paths: -------------- branches/Cog/platforms/Cross/vm/sqMemoryAccess.h Modified: branches/Cog/platforms/Cross/vm/sqMemoryAccess.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqMemoryAccess.h 2016-04-01 00:36:10 UTC (rev 3666) +++ branches/Cog/platforms/Cross/vm/sqMemoryAccess.h 2016-04-02 21:58:22 UTC (rev 3667) @@ -195,7 +195,45 @@ #define storeSingleFloatAtfrom(i, floatVar) storeSingleFloatAtPointerfrom(pointerForOop(i), floatVar) #define fetchSingleFloatAtinto(i, floatVar) fetchSingleFloatAtPointerinto(pointerForOop(i), floatVar) +/* These accessors are for accelerating byte swapping + whenever intrinsics or other fast functions are available */ +/* Compatibility with non-clang compilers */ +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif +/* GCC and Clang recent versions provide intrinsic byte swaps via builtins */ +#if (defined(__clang__) && __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)) \ + || (defined(__GNUC__ ) && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) +# define SQ_SWAP_4_BYTES(x) __builtin_bswap32(x) +# define SQ_SWAP_8_BYTES(x) __builtin_bswap64(x) +#elif defined(__linux__) +# include <byteswap.h> +# define SQ_SWAP_4_BYTES(x) bswap_32(x) +# define SQ_SWAP_8_BYTES(x) bswap_64(x) +#elif defined(_MSC_VER) +# include <stdlib.h> +# define SQ_SWAP_4_BYTES(x) _byteswap_ulong(x) +# define SQ_SWAP_8_BYTES(x) _byteswap_uint64(x) +#else +# define SQ_SWAP_4_BYTES(x) \ + (((unsigned int)(x) << 24) | \\ + (((unsigned int)(x) << 8) & 0xff0000U) | \\ + (((unsigned int)(x) >> 8) & 0xff00U) | \\ + ( (unsigned int)(x) >> 24)) +# define SQ_SWAP_8_BYTES(x) \ + (((unsigned long long)(x) << 56) | \\ + (((unsigned long long)(x) << 40) & 0xff000000000000ULL) | \\ + (((unsigned long long)(x) << 24) & 0xff0000000000ULL) | \\ + (((unsigned long long)(x) << 8) & 0xff00000000ULL) | \\ + (((unsigned long long)(x) >> 8) & 0xff000000ULL) | \\ + (((unsigned long long)(x) >> 24) & 0xff0000ULL) | \\ + (((unsigned long long)(x) >> 40) & 0xff00ULL) | \\ + ( (unsigned long long)(x) >> 56)) +#endif + + /* This doesn't belong here, but neither do 'self flag: ...'s belong in the image. We use a macro, not an inline function; we need no trace of flag. */

1 0

[Bug][Spur][Mac] Drag-n-drop broken
by Bert Freudenberg 01 Apr '16

01 Apr '16

When I drop a file into Squeak, the current VM locks up. Works fine in pre-Cocoa Spur. - Bert -

3 3

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2016