Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

VM Maker: VMMaker.oscog-eem.1700.mcz
by commits＠source.squeak.org 25 Feb '16

25 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1700.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1700 Author: eem Time: 24 February 2016, 4:37:07.211949 pm UUID: 4efaff50-3cc1-4840-8195-df0e306eb5a4 Ancestors: VMMaker.oscog-eem.1699 Fix special selector arithmetic and comparison in the 64-bit Cogit. My original code for genJumpNotSmallIntegersIn:andScratchReg: merely jumped if the tags differed, hence not jumping if both arguments were SmallFloat64s (or both Characters). The new code requires an additional scratch register; hence add genJumpNotSmallIntegersIn:andScratch:scratch:. =============== Diff against VMMaker.oscog-eem.1699 =============== Item was added: + ----- Method: CogObjectRepresentation>>genJumpNotSmallIntegersIn:andScratch:scratch: (in category 'compile abstract instructions') ----- + genJumpNotSmallIntegersIn: aRegister andScratch: scratchA scratch: scratchB + "Generate a compare and branch to test if aRegister and scratchA contains other than SmallIntegers, + i.e. don't branch if both aRegister and scratchA contain SmallIntegers. + Answer the jump. Destroy scratchA and scratchB if required." + <returnTypeC: #'AbstractInstruction *'> + ^self subclassResponsibility! Item was removed: - ----- Method: CogObjectRepresentation>>genJumpNotSmallIntegersIn:andScratchReg: (in category 'compile abstract instructions') ----- - genJumpNotSmallIntegersIn: aRegister andScratchReg: scratchReg - "Generate a compare and branch to test if aRegister and scratchReg contains other than SmallIntegers, - i.e. don't branch if both aRegister and scratchReg contain SmallIntegers. - Answer the jump. Destroy scratchReg if required." - <returnTypeC: #'AbstractInstruction *'> - ^self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>genJumpNotSmallIntegersIn:andScratch:scratch: (in category 'compile abstract instructions') ----- + genJumpNotSmallIntegersIn: aRegister andScratch: scratchA scratch: scratchB + "Generate a compare and branch to test if aRegister and scratchA contains other than SmallIntegers, + i.e. don't branch if both aRegister and scratchA contain SmallIntegers. + Answer the jump. Destroy scratchA and scratchB if required." + <returnTypeC: #'AbstractInstruction *'> + <inline: true> + cogit AndR: aRegister R: scratchA. + ^self genJumpNotSmallIntegerInScratchReg: scratchA! Item was removed: - ----- Method: CogObjectRepresentationFor32BitSpur>>genJumpNotSmallIntegersIn:andScratchReg: (in category 'compile abstract instructions') ----- - genJumpNotSmallIntegersIn: aRegister andScratchReg: scratchReg - "Generate a compare and branch to test if aRegister and scratchReg contains other than SmallIntegers, - i.e. don't branch if both aRegister and scratchReg contain SmallIntegers. - Answer the jump. Destroy scratchReg if required." - <returnTypeC: #'AbstractInstruction *'> - <inline: true> - cogit AndR: aRegister R: scratchReg. - ^self genJumpNotSmallIntegerInScratchReg: scratchReg! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallIntegersIn:andScratch:scratch: (in category 'compile abstract instructions') ----- + genJumpNotSmallIntegersIn: aRegister andScratch: scratchA scratch: scratchB + "Generate a compare and branch to test if aRegister and scratchA contains other than SmallIntegers, + i.e. don't branch if both aRegister and scratchA contain SmallIntegers. + Answer the jump. Destroy scratchA and scratchB if required." + <returnTypeC: #'AbstractInstruction *'> + "Map SmallIntegers to 0 in scratchA & scratchB, add and jump non-zero." + ^cogit + MoveR: aRegister R: scratchB; + SubCq: objectMemory smallIntegerTag R: scratchA; + SubCq: objectMemory smallIntegerTag R: scratchB; + AndCq: objectMemory tagMask R: scratchA; + AndCq: objectMemory tagMask R: scratchB; + AddR: scratchA R: scratchB; + JumpNonZero: 0! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallIntegersIn:andScratchReg: (in category 'compile abstract instructions') ----- - genJumpNotSmallIntegersIn: aRegister andScratchReg: scratchReg - "Generate a compare and branch to test if aRegister and scratchReg contains other than SmallIntegers, - i.e. don't branch if both aRegister and scratchReg contain SmallIntegers. - Answer the jump. Destroy scratchReg if required." - <returnTypeC: #'AbstractInstruction *'> - ^cogit - XorR: aRegister R: scratchReg; - AndCq: objectMemory tagMask R: scratchReg; - JumpNonZero: 0! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>genJumpNotSmallIntegersIn:andScratch:scratch: (in category 'compile abstract instructions') ----- + genJumpNotSmallIntegersIn: aRegister andScratch: scratchA scratch: scratchB + "Generate a compare and branch to test if aRegister and scratchA contains other than SmallIntegers, + i.e. don't branch if both aRegister and scratchA contain SmallIntegers. + Answer the jump. Destroy scratchA and scratchB if required." + <returnTypeC: #'AbstractInstruction *'> + <inline: true> + cogit AndR: aRegister R: scratchA. + ^self genJumpNotSmallIntegerInScratchReg: scratchA! Item was removed: - ----- Method: CogObjectRepresentationForSqueakV3>>genJumpNotSmallIntegersIn:andScratchReg: (in category 'compile abstract instructions') ----- - genJumpNotSmallIntegersIn: aRegister andScratchReg: scratchReg - "Generate a compare and branch to test if aRegister and scratchReg contains other than SmallIntegers, - i.e. don't branch if both aRegister and scratchReg contain SmallIntegers. - Answer the jump. Destroy scratchReg if required." - <returnTypeC: #'AbstractInstruction *'> - <inline: true> - cogit AndR: aRegister R: scratchReg. - ^self genJumpNotSmallIntegerInScratchReg: scratchReg! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorComparison (in category 'bytecode generators') ----- genSpecialSelectorComparison "Override to count inlined branches if followed by a conditional branch. We borrow the following conditional branch's counter and when about to inline the comparison we decrement the counter (without writing it back) and if it trips simply abort the inlining, falling back to the normal send which will then continue to the conditional branch which will trip and enter the abort." | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor rcvrIsInt argIsInt argInt jumpNotSmallInts inlineCAB annotateInst counterAddress countTripped counterReg index | <var: #countTripped type: #'AbstractInstruction *'> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ self genSpecialSelectorComparisonWithoutCounters ]. self ssFlushTo: simStackPtr - 2. primDescriptor := self generatorAt: byte0. argIsInt := self ssTop type = SSConstant and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (self ssValue: 1) type = SSConstant and: [objectMemory isIntegerObject: (self ssValue: 1) constant]. "short-cut the jump if operands are SmallInteger constants." (argIsInt and: [rcvrIsInt]) ifTrue: [^ self genStaticallyResolvedSpecialSelectorComparison]. self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. "Only interested in inlining if followed by a conditional branch." inlineCAB := branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]. "Further, only interested in inlining = and ~= if there's a SmallInteger constant involved. The relational operators successfully statically predict SmallIntegers; the equality operators do not." (inlineCAB and: [primDescriptor opcode = JumpZero or: [primDescriptor opcode = JumpNonZero]]) ifTrue: [inlineCAB := argIsInt or: [rcvrIsInt]]. inlineCAB ifFalse: [^self genSpecialSelectorSend]. argIsInt ifTrue: [(self ssValue: 1) popToReg: ReceiverResultReg. annotateInst := self ssTop annotateUse. self ssPop: 2. self MoveR: ReceiverResultReg R: TempReg] ifFalse: [self marshallSendArguments: 1. self MoveR: Arg0Reg R: TempReg]. jumpNotSmallInts := (argIsInt or: [rcvrIsInt]) ifTrue: [objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg] + ifFalse: [objectRepresentation genJumpNotSmallIntegersIn: ReceiverResultReg andScratch: TempReg scratch: ClassReg]. - ifFalse: [objectRepresentation genJumpNotSmallIntegersIn: ReceiverResultReg andScratchReg: TempReg]. counterReg := self allocateRegNotConflictingWith: (self registerMaskFor: ReceiverResultReg and: Arg0Reg). self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: counterReg. argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: (self CmpCq: argInt R: ReceiverResultReg)] ifFalse: [self CmpCq: argInt R: ReceiverResultReg]] ifFalse: [self CmpR: Arg0Reg R: ReceiverResultReg]. "Cmp is weird/backwards so invert the comparison. Further since there is a following conditional jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness." self genConditionalBranch: (branchDescriptor isBranchTrue ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). countTripped jmpTarget: (jumpNotSmallInts jmpTarget: self Label). argIsInt ifTrue: [self MoveCq: argInt R: Arg0Reg]. index := byte0 - self firstSpecialSelectorBytecodeOffset. ^self genMarshalledSend: index negated - 1 numArgs: 1 sendTable: ordinarySendTrampolines! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSpecialSelectorArithmetic (in category 'bytecode generators') ----- genSpecialSelectorArithmetic | primDescriptor rcvrIsConst argIsConst rcvrIsInt argIsInt rcvrInt argInt result jumpNotSmallInts jumpContinue annotateInst instToAnnotate index | <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> <var: #jumpContinue type: #'AbstractInstruction *'> <var: #instToAnnotate type: #'AbstractInstruction *'> primDescriptor := self generatorAt: byte0. argIsInt := (argIsConst := self ssTop type = SSConstant) and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (rcvrIsConst := (self ssValue: 1) type = SSConstant) and: [objectMemory isIntegerObject: (rcvrInt := (self ssValue: 1) constant)]. (argIsInt and: [rcvrIsInt]) ifTrue: [rcvrInt := objectMemory integerValueOf: rcvrInt. argInt := objectMemory integerValueOf: argInt. primDescriptor opcode caseOf: { [AddRR] -> [result := rcvrInt + argInt]. [SubRR] -> [result := rcvrInt - argInt]. [AndRR] -> [result := rcvrInt bitAnd: argInt]. [OrRR] -> [result := rcvrInt bitOr: argInt] }. (objectMemory isIntegerValue: result) ifTrue: ["Must enter any annotatedConstants into the map" self annotateBytecodeIfAnnotated: (self ssValue: 1). self annotateBytecodeIfAnnotated: self ssTop. "Must annotate the bytecode for correct pc mapping." ^self ssPop: 2; ssPushAnnotatedConstant: (objectMemory integerObjectOf: result)]. ^self genSpecialSelectorSend]. "If there's any constant involved other than a SmallInteger don't attempt to inline." ((rcvrIsConst and: [rcvrIsInt not]) or: [argIsConst and: [argIsInt not]]) ifTrue: [^self genSpecialSelectorSend]. "If we know nothing about the types then better not to inline as the inline cache and primitive code is not terribly slow so wasting time on duplicating tag tests is pointless." (argIsInt or: [rcvrIsInt]) ifFalse: [^self genSpecialSelectorSend]. argIsInt ifTrue: [self ssFlushTo: simStackPtr - 2. (self ssValue: 1) popToReg: ReceiverResultReg. annotateInst := self ssTop annotateUse. self ssPop: 2. self MoveR: ReceiverResultReg R: TempReg] ifFalse: [self marshallSendArguments: 1. self MoveR: Arg0Reg R: TempReg]. jumpNotSmallInts := (argIsInt or: [rcvrIsInt]) ifTrue: [objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg] + ifFalse: [objectRepresentation genJumpNotSmallIntegersIn: ReceiverResultReg andScratch: TempReg scratch: ClassReg]. - ifFalse: [objectRepresentation genJumpNotSmallIntegersIn: ReceiverResultReg andScratchReg: TempReg]. primDescriptor opcode caseOf: { [AddRR] -> [argIsInt ifTrue: [instToAnnotate := self AddCq: argInt - ConstZero R: ReceiverResultReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" self SubCq: argInt - ConstZero R: ReceiverResultReg] ifFalse: [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ReceiverResultReg. self AddR: Arg0Reg R: ReceiverResultReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" rcvrIsInt ifTrue: [self MoveCq: rcvrInt R: ReceiverResultReg] ifFalse: [self SubR: Arg0Reg R: ReceiverResultReg. objectRepresentation genSetSmallIntegerTagsIn: ReceiverResultReg]]]. [SubRR] -> [argIsInt ifTrue: [instToAnnotate := self SubCq: argInt - ConstZero R: ReceiverResultReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" self AddCq: argInt - ConstZero R: ReceiverResultReg] ifFalse: [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: Arg0Reg. self SubR: Arg0Reg R: ReceiverResultReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" self AddR: Arg0Reg R: ReceiverResultReg. objectRepresentation genSetSmallIntegerTagsIn: Arg0Reg]]. [AndRR] -> [argIsInt ifTrue: [instToAnnotate := self AndCq: argInt R: ReceiverResultReg] ifFalse: [self AndR: Arg0Reg R: ReceiverResultReg]. jumpContinue := self Jump: 0]. [OrRR] -> [argIsInt ifTrue: [instToAnnotate := self OrCq: argInt R: ReceiverResultReg] ifFalse: [self OrR: Arg0Reg R: ReceiverResultReg]. jumpContinue := self Jump: 0] }. jumpNotSmallInts jmpTarget: self Label. argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: instToAnnotate]. self MoveCq: argInt R: Arg0Reg]. index := byte0 - self firstSpecialSelectorBytecodeOffset. self genMarshalledSend: index negated - 1 numArgs: 1 sendTable: ordinarySendTrampolines. jumpContinue jmpTarget: self Label. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSpecialSelectorComparison (in category 'bytecode generators') ----- genSpecialSelectorComparison | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor rcvrIsInt argIsInt argInt jumpNotSmallInts inlineCAB annotateInst index | <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 2. primDescriptor := self generatorAt: byte0. argIsInt := self ssTop type = SSConstant and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (self ssValue: 1) type = SSConstant and: [objectMemory isIntegerObject: (self ssValue: 1) constant]. (argIsInt and: [rcvrIsInt]) ifTrue: [^ self genStaticallyResolvedSpecialSelectorComparison]. self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. "Only interested in inlining if followed by a conditional branch." inlineCAB := branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]. "Further, only interested in inlining = and ~= if there's a SmallInteger constant involved. The relational operators successfully statically predict SmallIntegers; the equality operators do not." (inlineCAB and: [primDescriptor opcode = JumpZero or: [primDescriptor opcode = JumpNonZero]]) ifTrue: [inlineCAB := argIsInt or: [rcvrIsInt]]. inlineCAB ifFalse: [^self genSpecialSelectorSend]. argIsInt ifTrue: [(self ssValue: 1) popToReg: ReceiverResultReg. annotateInst := self ssTop annotateUse. self ssPop: 2. self MoveR: ReceiverResultReg R: TempReg] ifFalse: [self marshallSendArguments: 1. self MoveR: Arg0Reg R: TempReg]. jumpNotSmallInts := (argIsInt or: [rcvrIsInt]) ifTrue: [objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg] + ifFalse: [objectRepresentation genJumpNotSmallIntegersIn: ReceiverResultReg andScratch: TempReg scratch: ClassReg]. - ifFalse: [objectRepresentation genJumpNotSmallIntegersIn: ReceiverResultReg andScratchReg: TempReg]. argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: (self CmpCq: argInt R: ReceiverResultReg)] ifFalse: [self CmpCq: argInt R: ReceiverResultReg]] ifFalse: [self CmpR: Arg0Reg R: ReceiverResultReg]. "Cmp is weird/backwards so invert the comparison. Further since there is a following conditional jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness." self genConditionalBranch: (branchDescriptor isBranchTrue ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). jumpNotSmallInts jmpTarget: self Label. argIsInt ifTrue: [self MoveCq: argInt R: Arg0Reg]. index := byte0 - self firstSpecialSelectorBytecodeOffset. ^self genMarshalledSend: index negated - 1 numArgs: 1 sendTable: ordinarySendTrampolines!

1 0

Re: [Pharo-dev] How was BoxedFloat64 integrated into the image ?
by Nicolai Hess 24 Feb '16

24 Feb '16

2016-02-23 8:48 GMT+01:00 Nicolai Hess <nicolaihess(a)gmail.com>: > > > 2016-02-23 3:55 GMT+01:00 Eliot Miranda <eliot.miranda(a)gmail.com>: > >> Hi Nicolai, >> >> there is a hairy script that moves methods around the hierarchy. >> IIRC Float is renamed to BoxedFloat64, then a new Float is introduced, then >> BoxedFloat64 made to inherit from it. It's likely that the last step of >> this script, which replaces the methodClassAssociations in the moved >> methods (makes those BoxedFloat64 methods that used to be Float or maybe >> vice verse) with the right association, didn't work. >> >> I don't know how the Pharo 5 image is built. If it is incremental then >> just write a script to fix the associations. But if the image is produced >> by a bootstrap you'll need to track down the script that creates the >> revised Float hierarchy and fix it to work properly in Pharo. >> >> _,,,^..^,,,_ (phone) >> > > Thanks Eliot, > > The methods for c lass Float and BoxedFloat are looking fine. Whats wrong > is, that some other methods referring to class Float in there source, now > having > BoxedFloat in its compiled method literal array, > #BoxedFloat64->BoxedFloat64 instead of #Float->Float. > > But it looks like recompiling the whole image fixes this. > > nicolai > Would it makes sense if BoxedFloat64 species returns Float ? > > >> >> On Feb 18, 2016, at 2:47 AM, Nicolai Hess <nicolaihess(a)gmail.com> wrote: >> >> Because we have compiled methods with BoxedFloat64 associations in the >> methods literals, but the source code still shows only "Float". >> >> 17638 >> <https://pharo.fogbugz.com/f/cases/17638/Browsing-calls-on-BoxedFloat64-show…> >> Browsing calls on BoxedFloat64 shows methods with reference to BoxedFloat64 >> in the code >> >> >> >> >

3 8

[commit][3631] CogVM source as per VMMaker.oscog-eem.1699
by commits＠squeakvm.org 24 Feb '16

24 Feb '16

Revision: 3631 Author: eliot Date: 2016-02-24 11:25:16 -0800 (Wed, 24 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1699 First, it was Stephane Rollandin who found the perform: bug. Apologies for the misattribution. Allow a plugin to override moduleName in generating its export table, via moduleExportsName. Hence fix compilation of the SqueakFFIPrims plugin as an internal plugin. Also use a single variable to hold moduleExportsName in the generated source. Make the SqueakFFIPrims plugin internal in the Mac pharo builds. Add a target to the Mac makefiles to allow printing a plugins prerequisites. This to try and debug why plugins are not remade unless FooPlugin.lib and/or FooPlugin.bundle are deleted. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.plugin branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int branches/Cog/build.macos64x64/common/Makefile.plugin branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/mkspur64vmarchives branches/Cog/scripts/revertIfEssentiallyUnchanged branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/AioPlugin/AioPlugin.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/BochsX64Plugin/BochsX64Plugin.c branches/Cog/src/plugins/CameraPlugin/CameraPlugin.c branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/plugins/DropPlugin/DropPlugin.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/ImmX11Plugin/ImmX11Plugin.c branches/Cog/src/plugins/InternetConfigPlugin/InternetConfigPlugin.c branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c branches/Cog/src/plugins/Klatt/Klatt.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c branches/Cog/src/plugins/Squeak3D/Squeak3D.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c branches/Cog/src/plugins/SqueakSSL/SqueakSSL.c branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c branches/Cog/src/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/src/plugins/UnicodePlugin/UnicodePlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/src/plugins/WeDoPlugin/WeDoPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-24 19:25:16 UTC (rev 3631) @@ -15,6 +15,8 @@ # SRCDIRS supplies additional directories containing files to compile. # PREREQUISITES supplies names of files that must exist to make lib or bundle +$(info $$(LIBNAME): $(LIBNAME)) + # VM config flags. ifeq ($(CONFIGURATION),product) OFLAGS:= -g -Os @@ -31,6 +33,7 @@ endif CFLAGS:= $(CFLAGS) $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS) + # The following are the four key locations (set via invocation): # PLUGINSRCDIR: Where is the root of the src/plugins source tree? # VMSRCDIR: Where is the root of the src vm source tree? Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-24 19:25:16 UTC (rev 3631) @@ -215,7 +215,7 @@ $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm $(BUILD)/vm/$(*F).lib || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ @@ -225,6 +225,12 @@ $(PLUGINHACK) \ $(OBJDIR)/$(*F).lib +prereqs/%.lib: + @-ls -rlt $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) \ + $(wildcard $(PLUGINSRCDIR)/$(*F)/*.c) \ + $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ + $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) + # It would be nice to have this abbreviation but it creates havoc eem 2/2016 #%.lib: $(OBJDIR)/%.lib # make $(MAKEFLAGS) $< @@ -236,7 +242,7 @@ $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).bundle || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext 2016-02-24 19:25:16 UTC (rev 3631) @@ -4,6 +4,5 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ -SqueakFFIPrims \ SqueakSSL \ UnixOSProcessPlugin Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-24 19:25:16 UTC (rev 3631) @@ -26,6 +26,7 @@ SoundCodecPrims \ SoundGenerationPlugin \ SoundPlugin \ +SqueakFFIPrims \ StarSqueakPlugin \ SurfacePlugin \ UUIDPlugin \ Modified: branches/Cog/build.macos64x64/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-24 19:25:16 UTC (rev 3631) @@ -15,6 +15,8 @@ # SRCDIRS supplies additional directories containing files to compile. # PREREQUISITES supplies names of files that must exist to make lib or bundle +$(info $$(LIBNAME): $(LIBNAME)) + # VM config flags. ifeq ($(CONFIGURATION),product) OFLAGS:= -g -Os @@ -31,6 +33,7 @@ endif CFLAGS:= $(CFLAGS) $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS) + # The following are the four key locations (set via invocation): # PLUGINSRCDIR: Where is the root of the src/plugins source tree? # VMSRCDIR: Where is the root of the src vm source tree? Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-24 19:25:16 UTC (rev 3631) @@ -215,7 +215,7 @@ $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm $(BUILD)/vm/$(*F).lib || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ @@ -225,6 +225,12 @@ $(PLUGINHACK) \ $(OBJDIR)/$(*F).lib +prereqs/%.lib: + @-ls -rlt $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) \ + $(wildcard $(PLUGINSRCDIR)/$(*F)/*.c) \ + $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ + $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) + # It would be nice to have this abbreviation but it creates havoc eem 2/2016 #%.lib: $(OBJDIR)/%.lib # make $(MAKEFLAGS) $< @@ -236,7 +242,7 @@ $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).bundle || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ Modified: branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext 2016-02-24 19:25:16 UTC (rev 3631) @@ -4,6 +4,5 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ -SqueakFFIPrims \ SqueakSSL \ UnixOSProcessPlugin Modified: branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-02-24 19:25:16 UTC (rev 3631) @@ -26,6 +26,7 @@ SoundCodecPrims \ SoundGenerationPlugin \ SoundPlugin \ +SqueakFFIPrims \ StarSqueakPlugin \ SurfacePlugin \ UUIDPlugin \ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + CCodeGenerator VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5883,12 +5883,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CoInterpreter VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2442,7 +2442,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1693"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1699"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17850,7 +17850,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -30067,7 +30067,7 @@ } /* begin success: */ successBoolean3 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == (extentX * extentY)); if (!successBoolean3) { @@ -30112,7 +30112,7 @@ } /* begin success: */ successBoolean7 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == 16); if (!successBoolean7) { @@ -30156,7 +30156,7 @@ } /* begin success: */ successBoolean9 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == 16); if (!successBoolean9) { @@ -35142,7 +35142,7 @@ } rcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); if (!(((rcvr & (tagMask())) == 0) - && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))) { + && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))) { (GIV(primFailCode) = PrimErrInappropriate); return; } @@ -35250,7 +35250,7 @@ } rcvr = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!(((rcvr & (tagMask())) == 0) - && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))) { + && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))) { (GIV(primFailCode) = PrimErrInappropriate); return; } @@ -35828,7 +35828,7 @@ if (!((((outPointerArray & (tagMask())) == 0) && (((((usqInt) (longAt(outPointerArray))) >> (formatShift())) & (formatMask())) == 2)) && (((segmentWordArray & (tagMask())) == 0) - && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))))) { + && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))))) { /* Must be indexable words */ /* begin primitiveFail */ @@ -40522,7 +40522,7 @@ && ((((outPointerArray & (tagMask())) == 0) && (((((usqInt) (longAt(outPointerArray))) >> (formatShift())) & (formatMask())) == 2)) && (((segmentWordArray & (tagMask())) == 0) - && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))))) { + && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))))) { /* Must be indexable words */ /* begin primitiveFail */ @@ -53934,7 +53934,7 @@ isWords(sqInt oop) { return ((oop & (tagMask())) == 0) - && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))); + && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))); } @@ -61538,7 +61538,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -67275,7 +67275,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; @@ -77063,7 +77063,7 @@ return; } if (((oop & (tagMask())) == 0) - && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) { + && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) { lastIndex = ((64 < ((numBytesOf(oop)) / BytesPerWord)) ? 64 : ((numBytesOf(oop)) / BytesPerWord)); if (lastIndex > 0) { for (index = 1; index <= lastIndex; index += 1) { @@ -84981,71 +84981,72 @@ } +static char _m[] = ""; void* vm_exports[][3] = { - {"", "callbackEnter", (void*)callbackEnter}, - {"", "callbackLeave", (void*)callbackLeave}, - {"", "moduleUnloaded", (void*)moduleUnloaded}, - {"", "primitiveAddLargeIntegers\000\377", (void*)primitiveAddLargeIntegers}, - {"", "primitiveAllInstances\000\377", (void*)primitiveAllInstances}, - {"", "primitiveAllObjects\000\377", (void*)primitiveAllObjects}, - {"", "primitiveBitAndLargeIntegers\000\377", (void*)primitiveBitAndLargeIntegers}, - {"", "primitiveBitOrLargeIntegers\000\377", (void*)primitiveBitOrLargeIntegers}, - {"", "primitiveBitShiftLargeIntegers\000\377", (void*)primitiveBitShiftLargeIntegers}, - {"", "primitiveBitXorLargeIntegers\000\377", (void*)primitiveBitXorLargeIntegers}, - {"", "primitiveClockLogAddresses\000\377", (void*)primitiveClockLogAddresses}, - {"", "primitiveCompareBytes\000\377", (void*)primitiveCompareBytes}, - {"", "primitiveCrashVM\000\377", (void*)primitiveCrashVM}, - {"", "primitiveDisablePowerManager\000\377", (void*)primitiveDisablePowerManager}, - {"", "primitiveDivideLargeIntegers\000\377", (void*)primitiveDivideLargeIntegers}, - {"", "primitiveDivLargeIntegers\000\377", (void*)primitiveDivLargeIntegers}, - {"", "primitiveEqualLargeIntegers\000\377", (void*)primitiveEqualLargeIntegers}, - {"", "primitiveEventProcessingControl\000\377", (void*)primitiveEventProcessingControl}, - {"", "primitiveGetLogDirectory\000\377", (void*)primitiveGetLogDirectory}, - {"", "primitiveGetWindowLabel\000\377", (void*)primitiveGetWindowLabel}, - {"", "primitiveGetWindowSize\000\377", (void*)primitiveGetWindowSize}, - {"", "primitiveGreaterOrEqualLargeIntegers\000\377", (void*)primitiveGreaterOrEqualLargeIntegers}, - {"", "primitiveGreaterThanLargeIntegers\000\377", (void*)primitiveGreaterThanLargeIntegers}, - {"", "primitiveHeartbeatFrequency\000\377", (void*)primitiveHeartbeatFrequency}, - {"", "primitiveHighResClock\000\377", (void*)primitiveHighResClock}, - {"", "primitiveImageFormatVersion\000\377", (void*)primitiveImageFormatVersion}, - {"", "primitiveInterruptChecksPerMSec\000\377", (void*)primitiveInterruptChecksPerMSec}, - {"", "primitiveIsBigEnder\000\377", (void*)primitiveIsBigEnder}, - {"", "primitiveIsWindowObscured\000\377", (void*)primitiveIsWindowObscured}, - {"", "primitiveLessOrEqualLargeIntegers\000\377", (void*)primitiveLessOrEqualLargeIntegers}, - {"", "primitiveLessThanLargeIntegers\000\377", (void*)primitiveLessThanLargeIntegers}, - {"", "primitiveLongRunningPrimitive\000\377", (void*)primitiveLongRunningPrimitive}, - {"", "primitiveLongRunningPrimitiveSemaphore\000\377", (void*)primitiveLongRunningPrimitiveSemaphore}, - {"", "primitiveMillisecondClockMask\000\377", (void*)primitiveMillisecondClockMask}, - {"", "primitiveMinimumUnusedHeadroom\000\377", (void*)primitiveMinimumUnusedHeadroom}, - {"", "primitiveModLargeIntegers\000\377", (void*)primitiveModLargeIntegers}, - {"", "primitiveMultiplyLargeIntegers\000\377", (void*)primitiveMultiplyLargeIntegers}, - {"", "primitiveNotEqualLargeIntegers\000\377", (void*)primitiveNotEqualLargeIntegers}, - {"", "primitiveOriginalMillisecondClock\000\377", (void*)primitiveOriginalMillisecondClock}, - {"", "primitivePathToUsing\000\377", (void*)primitivePathToUsing}, - {"", "primitiveProfilePrimitive\000\377", (void*)primitiveProfilePrimitive}, - {"", "primitiveProfileSample\000\377", (void*)primitiveProfileSample}, - {"", "primitiveProfileSemaphore\000\377", (void*)primitiveProfileSemaphore}, - {"", "primitiveProfileStart\000\377", (void*)primitiveProfileStart}, - {"", "primitiveQuoLargeIntegers\000\377", (void*)primitiveQuoLargeIntegers}, - {"", "primitiveRemLargeIntegers\000\377", (void*)primitiveRemLargeIntegers}, - {"", "primitiveScreenDepth\000\377", (void*)primitiveScreenDepth}, - {"", "primitiveSetGCSemaphore\000\377", (void*)primitiveSetGCSemaphore}, - {"", "primitiveSetLogDirectory\000\377", (void*)primitiveSetLogDirectory}, - {"", "primitiveSetWindowLabel\000\377", (void*)primitiveSetWindowLabel}, - {"", "primitiveSetWindowSize\000\377", (void*)primitiveSetWindowSize}, - {"", "primitiveSubtractLargeIntegers\000\377", (void*)primitiveSubtractLargeIntegers}, - {"", "primitiveUtcWithOffset\000\377", (void*)primitiveUtcWithOffset}, - {"", "primitiveVoidReceiver\000\377", (void*)primitiveVoidReceiver}, - {"", "printFramesInPage", (void*)printFramesInPage}, - {"", "printFramesOnStackPageListInUse\000\377", (void*)printFramesOnStackPageListInUse}, - {"", "reestablishContextPriorToCallback", (void*)reestablishContextPriorToCallback}, - {"", "returnAsThroughCallbackContext", (void*)returnAsThroughCallbackContext}, - {"", "segmentContainingObj", (void*)segmentContainingObj}, - {"", "sendInvokeCallbackContext", (void*)sendInvokeCallbackContext}, - {"", "sendInvokeCallbackStackRegistersJmpbuf", (void*)sendInvokeCallbackStackRegistersJmpbuf}, - {"", "setInterruptCheckChain", (void*)setInterruptCheckChain}, - {"", "shortPrintFramesInPage", (void*)shortPrintFramesInPage}, - {"", "shortPrintFramesOnStackPageListInUse\000\377", (void*)shortPrintFramesOnStackPageListInUse}, + {(void*)_m, "callbackEnter", (void*)callbackEnter}, + {(void*)_m, "callbackLeave", (void*)callbackLeave}, + {(void*)_m, "moduleUnloaded", (void*)moduleUnloaded}, + {(void*)_m, "primitiveAddLargeIntegers\000\377", (void*)primitiveAddLargeIntegers}, + {(void*)_m, "primitiveAllInstances\000\377", (void*)primitiveAllInstances}, + {(void*)_m, "primitiveAllObjects\000\377", (void*)primitiveAllObjects}, + {(void*)_m, "primitiveBitAndLargeIntegers\000\377", (void*)primitiveBitAndLargeIntegers}, + {(void*)_m, "primitiveBitOrLargeIntegers\000\377", (void*)primitiveBitOrLargeIntegers}, + {(void*)_m, "primitiveBitShiftLargeIntegers\000\377", (void*)primitiveBitShiftLargeIntegers}, + {(void*)_m, "primitiveBitXorLargeIntegers\000\377", (void*)primitiveBitXorLargeIntegers}, + {(void*)_m, "primitiveClockLogAddresses\000\377", (void*)primitiveClockLogAddresses}, + {(void*)_m, "primitiveCompareBytes\000\377", (void*)primitiveCompareBytes}, + {(void*)_m, "primitiveCrashVM\000\377", (void*)primitiveCrashVM}, + {(void*)_m, "primitiveDisablePowerManager\000\377", (void*)primitiveDisablePowerManager}, + {(void*)_m, "primitiveDivideLargeIntegers\000\377", (void*)primitiveDivideLargeIntegers}, + {(void*)_m, "primitiveDivLargeIntegers\000\377", (void*)primitiveDivLargeIntegers}, + {(void*)_m, "primitiveEqualLargeIntegers\000\377", (void*)primitiveEqualLargeIntegers}, + {(void*)_m, "primitiveEventProcessingControl\000\377", (void*)primitiveEventProcessingControl}, + {(void*)_m, "primitiveGetLogDirectory\000\377", (void*)primitiveGetLogDirectory}, + {(void*)_m, "primitiveGetWindowLabel\000\377", (void*)primitiveGetWindowLabel}, + {(void*)_m, "primitiveGetWindowSize\000\377", (void*)primitiveGetWindowSize}, + {(void*)_m, "primitiveGreaterOrEqualLargeIntegers\000\377", (void*)primitiveGreaterOrEqualLargeIntegers}, + {(void*)_m, "primitiveGreaterThanLargeIntegers\000\377", (void*)primitiveGreaterThanLargeIntegers}, + {(void*)_m, "primitiveHeartbeatFrequency\000\377", (void*)primitiveHeartbeatFrequency}, + {(void*)_m, "primitiveHighResClock\000\377", (void*)primitiveHighResClock}, + {(void*)_m, "primitiveImageFormatVersion\000\377", (void*)primitiveImageFormatVersion}, + {(void*)_m, "primitiveInterruptChecksPerMSec\000\377", (void*)primitiveInterruptChecksPerMSec}, + {(void*)_m, "primitiveIsBigEnder\000\377", (void*)primitiveIsBigEnder}, + {(void*)_m, "primitiveIsWindowObscured\000\377", (void*)primitiveIsWindowObscured}, + {(void*)_m, "primitiveLessOrEqualLargeIntegers\000\377", (void*)primitiveLessOrEqualLargeIntegers}, + {(void*)_m, "primitiveLessThanLargeIntegers\000\377", (void*)primitiveLessThanLargeIntegers}, + {(void*)_m, "primitiveLongRunningPrimitive\000\377", (void*)primitiveLongRunningPrimitive}, + {(void*)_m, "primitiveLongRunningPrimitiveSemaphore\000\377", (void*)primitiveLongRunningPrimitiveSemaphore}, + {(void*)_m, "primitiveMillisecondClockMask\000\377", (void*)primitiveMillisecondClockMask}, + {(void*)_m, "primitiveMinimumUnusedHeadroom\000\377", (void*)primitiveMinimumUnusedHeadroom}, + {(void*)_m, "primitiveModLargeIntegers\000\377", (void*)primitiveModLargeIntegers}, + {(void*)_m, "primitiveMultiplyLargeIntegers\000\377", (void*)primitiveMultiplyLargeIntegers}, + {(void*)_m, "primitiveNotEqualLargeIntegers\000\377", (void*)primitiveNotEqualLargeIntegers}, + {(void*)_m, "primitiveOriginalMillisecondClock\000\377", (void*)primitiveOriginalMillisecondClock}, + {(void*)_m, "primitivePathToUsing\000\377", (void*)primitivePathToUsing}, + {(void*)_m, "primitiveProfilePrimitive\000\377", (void*)primitiveProfilePrimitive}, + {(void*)_m, "primitiveProfileSample\000\377", (void*)primitiveProfileSample}, + {(void*)_m, "primitiveProfileSemaphore\000\377", (void*)primitiveProfileSemaphore}, + {(void*)_m, "primitiveProfileStart\000\377", (void*)primitiveProfileStart}, + {(void*)_m, "primitiveQuoLargeIntegers\000\377", (void*)primitiveQuoLargeIntegers}, + {(void*)_m, "primitiveRemLargeIntegers\000\377", (void*)primitiveRemLargeIntegers}, + {(void*)_m, "primitiveScreenDepth\000\377", (void*)primitiveScreenDepth}, + {(void*)_m, "primitiveSetGCSemaphore\000\377", (void*)primitiveSetGCSemaphore}, + {(void*)_m, "primitiveSetLogDirectory\000\377", (void*)primitiveSetLogDirectory}, + {(void*)_m, "primitiveSetWindowLabel\000\377", (void*)primitiveSetWindowLabel}, + {(void*)_m, "primitiveSetWindowSize\000\377", (void*)primitiveSetWindowSize}, + {(void*)_m, "primitiveSubtractLargeIntegers\000\377", (void*)primitiveSubtractLargeIntegers}, + {(void*)_m, "primitiveUtcWithOffset\000\377", (void*)primitiveUtcWithOffset}, + {(void*)_m, "primitiveVoidReceiver\000\377", (void*)primitiveVoidReceiver}, + {(void*)_m, "printFramesInPage", (void*)printFramesInPage}, + {(void*)_m, "printFramesOnStackPageListInUse\000\377", (void*)printFramesOnStackPageListInUse}, + {(void*)_m, "reestablishContextPriorToCallback", (void*)reestablishContextPriorToCallback}, + {(void*)_m, "returnAsThroughCallbackContext", (void*)returnAsThroughCallbackContext}, + {(void*)_m, "segmentContainingObj", (void*)segmentContainingObj}, + {(void*)_m, "sendInvokeCallbackContext", (void*)sendInvokeCallbackContext}, + {(void*)_m, "sendInvokeCallbackStackRegistersJmpbuf", (void*)sendInvokeCallbackStackRegistersJmpbuf}, + {(void*)_m, "setInterruptCheckChain", (void*)setInterruptCheckChain}, + {(void*)_m, "shortPrintFramesInPage", (void*)shortPrintFramesInPage}, + {(void*)_m, "shortPrintFramesOnStackPageListInUse\000\377", (void*)shortPrintFramesOnStackPageListInUse}, {NULL, NULL, NULL} }; Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CoInterpreter VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2445,7 +2445,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1693"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1699"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17859,7 +17859,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -30076,7 +30076,7 @@ } /* begin success: */ successBoolean3 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == (extentX * extentY)); if (!successBoolean3) { @@ -30121,7 +30121,7 @@ } /* begin success: */ successBoolean7 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == 16); if (!successBoolean7) { @@ -30165,7 +30165,7 @@ } /* begin success: */ successBoolean9 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == 16); if (!successBoolean9) { @@ -35151,7 +35151,7 @@ } rcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); if (!(((rcvr & (tagMask())) == 0) - && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))) { + && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))) { (GIV(primFailCode) = PrimErrInappropriate); return; } @@ -35259,7 +35259,7 @@ } rcvr = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!(((rcvr & (tagMask())) == 0) - && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))) { + && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))) { (GIV(primFailCode) = PrimErrInappropriate); return; } @@ -35837,7 +35837,7 @@ if (!((((outPointerArray & (tagMask())) == 0) && (((((usqInt) (longAt(outPointerArray))) >> (formatShift())) & (formatMask())) == 2)) && (((segmentWordArray & (tagMask())) == 0) - && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))))) { + && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))))) { /* Must be indexable words */ /* begin primitiveFail */ @@ -40531,7 +40531,7 @@ && ((((outPointerArray & (tagMask())) == 0) && (((((usqInt) (longAt(outPointerArray))) >> (formatShift())) & (formatMask())) == 2)) && (((segmentWordArray & (tagMask())) == 0) - && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))))) { + && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))))) { /* Must be indexable words */ /* begin primitiveFail */ @@ -53943,7 +53943,7 @@ isWords(sqInt oop) { return ((oop & (tagMask())) == 0) - && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))); + && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))); } @@ -61547,7 +61547,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -67284,7 +67284,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; @@ -77072,7 +77072,7 @@ return; } if (((oop & (tagMask())) == 0) - && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) { + && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) { lastIndex = ((64 < ((numBytesOf(oop)) / BytesPerWord)) ? 64 : ((numBytesOf(oop)) / BytesPerWord)); if (lastIndex > 0) { for (index = 1; index <= lastIndex; index += 1) { @@ -84990,71 +84990,72 @@ } +static char _m[] = ""; void* vm_exports[][3] = { - {"", "callbackEnter", (void*)callbackEnter}, - {"", "callbackLeave", (void*)callbackLeave}, - {"", "moduleUnloaded", (void*)moduleUnloaded}, - {"", "primitiveAddLargeIntegers\000\377", (void*)primitiveAddLargeIntegers}, - {"", "primitiveAllInstances\000\377", (void*)primitiveAllInstances}, - {"", "primitiveAllObjects\000\377", (void*)primitiveAllObjects}, - {"", "primitiveBitAndLargeIntegers\000\377", (void*)primitiveBitAndLargeIntegers}, - {"", "primitiveBitOrLargeIntegers\000\377", (void*)primitiveBitOrLargeIntegers}, - {"", "primitiveBitShiftLargeIntegers\000\377", (void*)primitiveBitShiftLargeIntegers}, - {"", "primitiveBitXorLargeIntegers\000\377", (void*)primitiveBitXorLargeIntegers}, - {"", "primitiveClockLogAddresses\000\377", (void*)primitiveClockLogAddresses}, - {"", "primitiveCompareBytes\000\377", (void*)primitiveCompareBytes}, - {"", "primitiveCrashVM\000\377", (void*)primitiveCrashVM}, - {"", "primitiveDisablePowerManager\000\377", (void*)primitiveDisablePowerManager}, - {"", "primitiveDivideLargeIntegers\000\377", (void*)primitiveDivideLargeIntegers}, - {"", "primitiveDivLargeIntegers\000\377", (void*)primitiveDivLargeIntegers}, - {"", "primitiveEqualLargeIntegers\000\377", (void*)primitiveEqualLargeIntegers}, - {"", "primitiveEventProcessingControl\000\377", (void*)primitiveEventProcessingControl}, - {"", "primitiveGetLogDirectory\000\377", (void*)primitiveGetLogDirectory}, - {"", "primitiveGetWindowLabel\000\377", (void*)primitiveGetWindowLabel}, - {"", "primitiveGetWindowSize\000\377", (void*)primitiveGetWindowSize}, - {"", "primitiveGreaterOrEqualLargeIntegers\000\377", (void*)primitiveGreaterOrEqualLargeIntegers}, - {"", "primitiveGreaterThanLargeIntegers\000\377", (void*)primitiveGreaterThanLargeIntegers}, - {"", "primitiveHeartbeatFrequency\000\377", (void*)primitiveHeartbeatFrequency}, - {"", "primitiveHighResClock\000\377", (void*)primitiveHighResClock}, - {"", "primitiveImageFormatVersion\000\377", (void*)primitiveImageFormatVersion}, - {"", "primitiveInterruptChecksPerMSec\000\377", (void*)primitiveInterruptChecksPerMSec}, - {"", "primitiveIsBigEnder\000\377", (void*)primitiveIsBigEnder}, - {"", "primitiveIsWindowObscured\000\377", (void*)primitiveIsWindowObscured}, - {"", "primitiveLessOrEqualLargeIntegers\000\377", (void*)primitiveLessOrEqualLargeIntegers}, - {"", "primitiveLessThanLargeIntegers\000\377", (void*)primitiveLessThanLargeIntegers}, - {"", "primitiveLongRunningPrimitive\000\377", (void*)primitiveLongRunningPrimitive}, - {"", "primitiveLongRunningPrimitiveSemaphore\000\377", (void*)primitiveLongRunningPrimitiveSemaphore}, - {"", "primitiveMillisecondClockMask\000\377", (void*)primitiveMillisecondClockMask}, - {"", "primitiveMinimumUnusedHeadroom\000\377", (void*)primitiveMinimumUnusedHeadroom}, - {"", "primitiveModLargeIntegers\000\377", (void*)primitiveModLargeIntegers}, - {"", "primitiveMultiplyLargeIntegers\000\377", (void*)primitiveMultiplyLargeIntegers}, - {"", "primitiveNotEqualLargeIntegers\000\377", (void*)primitiveNotEqualLargeIntegers}, - {"", "primitiveOriginalMillisecondClock\000\377", (void*)primitiveOriginalMillisecondClock}, - {"", "primitivePathToUsing\000\377", (void*)primitivePathToUsing}, - {"", "primitiveProfilePrimitive\000\377", (void*)primitiveProfilePrimitive}, - {"", "primitiveProfileSample\000\377", (void*)primitiveProfileSample}, - {"", "primitiveProfileSemaphore\000\377", (void*)primitiveProfileSemaphore}, - {"", "primitiveProfileStart\000\377", (void*)primitiveProfileStart}, - {"", "primitiveQuoLargeIntegers\000\377", (void*)primitiveQuoLargeIntegers}, - {"", "primitiveRemLargeIntegers\000\377", (void*)primitiveRemLargeIntegers}, - {"", "primitiveScreenDepth\000\377", (void*)primitiveScreenDepth}, - {"", "primitiveSetGCSemaphore\000\377", (void*)primitiveSetGCSemaphore}, - {"", "primitiveSetLogDirectory\000\377", (void*)primitiveSetLogDirectory}, - {"", "primitiveSetWindowLabel\000\377", (void*)primitiveSetWindowLabel}, - {"", "primitiveSetWindowSize\000\377", (void*)primitiveSetWindowSize}, - {"", "primitiveSubtractLargeIntegers\000\377", (void*)primitiveSubtractLargeIntegers}, - {"", "primitiveUtcWithOffset\000\377", (void*)primitiveUtcWithOffset}, - {"", "primitiveVoidReceiver\000\377", (void*)primitiveVoidReceiver}, - {"", "printFramesInPage", (void*)printFramesInPage}, - {"", "printFramesOnStackPageListInUse\000\377", (void*)printFramesOnStackPageListInUse}, - {"", "reestablishContextPriorToCallback", (void*)reestablishContextPriorToCallback}, - {"", "returnAsThroughCallbackContext", (void*)returnAsThroughCallbackContext}, - {"", "segmentContainingObj", (void*)segmentContainingObj}, - {"", "sendInvokeCallbackContext", (void*)sendInvokeCallbackContext}, - {"", "sendInvokeCallbackStackRegistersJmpbuf", (void*)sendInvokeCallbackStackRegistersJmpbuf}, - {"", "setInterruptCheckChain", (void*)setInterruptCheckChain}, - {"", "shortPrintFramesInPage", (void*)shortPrintFramesInPage}, - {"", "shortPrintFramesOnStackPageListInUse\000\377", (void*)shortPrintFramesOnStackPageListInUse}, + {(void*)_m, "callbackEnter", (void*)callbackEnter}, + {(void*)_m, "callbackLeave", (void*)callbackLeave}, + {(void*)_m, "moduleUnloaded", (void*)moduleUnloaded}, + {(void*)_m, "primitiveAddLargeIntegers\000\377", (void*)primitiveAddLargeIntegers}, + {(void*)_m, "primitiveAllInstances\000\377", (void*)primitiveAllInstances}, + {(void*)_m, "primitiveAllObjects\000\377", (void*)primitiveAllObjects}, + {(void*)_m, "primitiveBitAndLargeIntegers\000\377", (void*)primitiveBitAndLargeIntegers}, + {(void*)_m, "primitiveBitOrLargeIntegers\000\377", (void*)primitiveBitOrLargeIntegers}, + {(void*)_m, "primitiveBitShiftLargeIntegers\000\377", (void*)primitiveBitShiftLargeIntegers}, + {(void*)_m, "primitiveBitXorLargeIntegers\000\377", (void*)primitiveBitXorLargeIntegers}, + {(void*)_m, "primitiveClockLogAddresses\000\377", (void*)primitiveClockLogAddresses}, + {(void*)_m, "primitiveCompareBytes\000\377", (void*)primitiveCompareBytes}, + {(void*)_m, "primitiveCrashVM\000\377", (void*)primitiveCrashVM}, + {(void*)_m, "primitiveDisablePowerManager\000\377", (void*)primitiveDisablePowerManager}, + {(void*)_m, "primitiveDivideLargeIntegers\000\377", (void*)primitiveDivideLargeIntegers}, + {(void*)_m, "primitiveDivLargeIntegers\000\377", (void*)primitiveDivLargeIntegers}, + {(void*)_m, "primitiveEqualLargeIntegers\000\377", (void*)primitiveEqualLargeIntegers}, + {(void*)_m, "primitiveEventProcessingControl\000\377", (void*)primitiveEventProcessingControl}, + {(void*)_m, "primitiveGetLogDirectory\000\377", (void*)primitiveGetLogDirectory}, + {(void*)_m, "primitiveGetWindowLabel\000\377", (void*)primitiveGetWindowLabel}, + {(void*)_m, "primitiveGetWindowSize\000\377", (void*)primitiveGetWindowSize}, + {(void*)_m, "primitiveGreaterOrEqualLargeIntegers\000\377", (void*)primitiveGreaterOrEqualLargeIntegers}, + {(void*)_m, "primitiveGreaterThanLargeIntegers\000\377", (void*)primitiveGreaterThanLargeIntegers}, + {(void*)_m, "primitiveHeartbeatFrequency\000\377", (void*)primitiveHeartbeatFrequency}, + {(void*)_m, "primitiveHighResClock\000\377", (void*)primitiveHighResClock}, + {(void*)_m, "primitiveImageFormatVersion\000\377", (void*)primitiveImageFormatVersion}, + {(void*)_m, "primitiveInterruptChecksPerMSec\000\377", (void*)primitiveInterruptChecksPerMSec}, + {(void*)_m, "primitiveIsBigEnder\000\377", (void*)primitiveIsBigEnder}, + {(void*)_m, "primitiveIsWindowObscured\000\377", (void*)primitiveIsWindowObscured}, + {(void*)_m, "primitiveLessOrEqualLargeIntegers\000\377", (void*)primitiveLessOrEqualLargeIntegers}, + {(void*)_m, "primitiveLessThanLargeIntegers\000\377", (void*)primitiveLessThanLargeIntegers}, + {(void*)_m, "primitiveLongRunningPrimitive\000\377", (void*)primitiveLongRunningPrimitive}, + {(void*)_m, "primitiveLongRunningPrimitiveSemaphore\000\377", (void*)primitiveLongRunningPrimitiveSemaphore}, + {(void*)_m, "primitiveMillisecondClockMask\000\377", (void*)primitiveMillisecondClockMask}, + {(void*)_m, "primitiveMinimumUnusedHeadroom\000\377", (void*)primitiveMinimumUnusedHeadroom}, + {(void*)_m, "primitiveModLargeIntegers\000\377", (void*)primitiveModLargeIntegers}, + {(void*)_m, "primitiveMultiplyLargeIntegers\000\377", (void*)primitiveMultiplyLargeIntegers}, + {(void*)_m, "primitiveNotEqualLargeIntegers\000\377", (void*)primitiveNotEqualLargeIntegers}, + {(void*)_m, "primitiveOriginalMillisecondClock\000\377", (void*)primitiveOriginalMillisecondClock}, + {(void*)_m, "primitivePathToUsing\000\377", (void*)primitivePathToUsing}, + {(void*)_m, "primitiveProfilePrimitive\000\377", (void*)primitiveProfilePrimitive}, + {(void*)_m, "primitiveProfileSample\000\377", (void*)primitiveProfileSample}, + {(void*)_m, "primitiveProfileSemaphore\000\377", (void*)primitiveProfileSemaphore}, + {(void*)_m, "primitiveProfileStart\000\377", (void*)primitiveProfileStart}, + {(void*)_m, "primitiveQuoLargeIntegers\000\377", (void*)primitiveQuoLargeIntegers}, + {(void*)_m, "primitiveRemLargeIntegers\000\377", (void*)primitiveRemLargeIntegers}, + {(void*)_m, "primitiveScreenDepth\000\377", (void*)primitiveScreenDepth}, + {(void*)_m, "primitiveSetGCSemaphore\000\377", (void*)primitiveSetGCSemaphore}, + {(void*)_m, "primitiveSetLogDirectory\000\377", (void*)primitiveSetLogDirectory}, + {(void*)_m, "primitiveSetWindowLabel\000\377", (void*)primitiveSetWindowLabel}, + {(void*)_m, "primitiveSetWindowSize\000\377", (void*)primitiveSetWindowSize}, + {(void*)_m, "primitiveSubtractLargeIntegers\000\377", (void*)primitiveSubtractLargeIntegers}, + {(void*)_m, "primitiveUtcWithOffset\000\377", (void*)primitiveUtcWithOffset}, + {(void*)_m, "primitiveVoidReceiver\000\377", (void*)primitiveVoidReceiver}, + {(void*)_m, "printFramesInPage", (void*)printFramesInPage}, + {(void*)_m, "printFramesOnStackPageListInUse\000\377", (void*)printFramesOnStackPageListInUse}, + {(void*)_m, "reestablishContextPriorToCallback", (void*)reestablishContextPriorToCallback}, + {(void*)_m, "returnAsThroughCallbackContext", (void*)returnAsThroughCallbackContext}, + {(void*)_m, "segmentContainingObj", (void*)segmentContainingObj}, + {(void*)_m, "sendInvokeCallbackContext", (void*)sendInvokeCallbackContext}, + {(void*)_m, "sendInvokeCallbackStackRegistersJmpbuf", (void*)sendInvokeCallbackStackRegistersJmpbuf}, + {(void*)_m, "setInterruptCheckChain", (void*)setInterruptCheckChain}, + {(void*)_m, "shortPrintFramesInPage", (void*)shortPrintFramesInPage}, + {(void*)_m, "shortPrintFramesOnStackPageListInUse\000\377", (void*)shortPrintFramesOnStackPageListInUse}, {NULL, NULL, NULL} }; Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + CCodeGenerator VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10558,12 +10558,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + CCodeGenerator VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9626,12 +9626,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + CCodeGenerator VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5738,12 +5738,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspursrc/vm/cointerp.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1699.mcz
by commits＠source.squeak.org 24 Feb '16

24 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1699.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1699 Author: eem Time: 24 February 2016, 9:16:10.818176 am UUID: 186ebd51-28ef-4e7f-8411-96b61577b777 Ancestors: VMMaker.oscog-eem.1698 Allow a plugin to override moduleName in generating its export table, via moduleExportsName. To this end eliminate the pluginName variable from VMPluginCodeGenerator and use pluginClass moduleName instead. Also use a shared variable to hold the moduleExportsName in the gnerated source. =============== Diff against VMMaker.oscog-eem.1698 =============== Item was changed: ----- Method: CCodeGenerator>>emitExportsNamed:pluginName:on: (in category 'C code generator') ----- emitExportsNamed: exportsNamePrefix pluginName: pluginName on: aStream "Store all the exported primitives in the form used by the internal named prim system." | nilVMClass excludeDepth | (nilVMClass := vmClass isNil) ifTrue: "We need a vmClass temporarily to compute accessor depths." [vmClass := StackInterpreter]. "Don't include the depth in the vm's named primitives if the vm is non-Spur." excludeDepth := exportsNamePrefix = 'vm' and: [pluginName isEmpty and: [vmClass objectMemoryClass hasSpurMemoryManagerAPI not]]. + aStream cr; cr; nextPutAll: 'static char _m[] = "'; nextPutAll: pluginName; nextPutAll: '";'. + aStream cr; nextPutAll: 'void* '; nextPutAll: exportsNamePrefix; nextPutAll: '_exports[][3] = {'; cr. - aStream cr; cr; nextPutAll: 'void* '; nextPutAll: exportsNamePrefix; nextPutAll: '_exports[][3] = {'; cr. ((methods select: [:m| m export]) asSortedCollection: [:a :b| a selector caseSensitiveLessOrEqual: b selector]) do: [:method| | compileTimeOptionPragmas primName | (compileTimeOptionPragmas := method compileTimeOptionPragmas) notEmpty ifTrue: [method outputConditionalDefineFor: compileTimeOptionPragmas on: aStream]. primName := self cFunctionNameFor: method selector. + aStream tab; nextPutAll: '{(void*)_m, "'; nextPutAll: primName. - aStream tab; nextPutAll: '{"'; nextPutAll: pluginName; nextPutAll: '", "'; nextPutAll: primName. excludeDepth ifFalse: [(self accessorDepthForSelector: primName asSymbol) ifNotNil: [:depth| "store the accessor depth in a hidden byte immediately after the primName" self assert: depth < 128. aStream nextPutAll: '\000\'; nextPutAll: ((depth bitAnd: 255) printStringBase: 8 nDigits: 3)]]. aStream nextPutAll: '", (void*)'; nextPutAll: primName; nextPutAll: '},'; cr. method terminateConditionalDefineFor: compileTimeOptionPragmas on: aStream]. aStream tab; nextPutAll: '{NULL, NULL, NULL}'; cr; nextPutAll: '};'; cr. nilVMClass ifTrue: [vmClass := nil]! Item was added: + ----- Method: InterpreterPlugin class>>moduleExportsName (in category 'translation') ----- + moduleExportsName + "Answer the name to include in receiver's internal plugin exports. + This is the value of the module: argument in named primitives. + By default answer the moduleName." + + ^self moduleName! Item was changed: ----- Method: SimulatorEventTransformer>>degenerateMouseEvent:for: (in category 'event transformation') ----- degenerateMouseEvent: aMorphicEvent for: aClient "Convert the mouse event into low-level events for the VM simulator (aClient). Filter-out mouse moves, and generate a fake mouse move before each button press. See HandMorph>>generateMouseEvent" | translated | translated := aMorphicEvent position - aClient displayView bounds origin. modifiers := aMorphicEvent buttons >> 3. "Sad, but modifiers come in on mouse move events..." aMorphicEvent type == #mouseMove + ifTrue: "filter-out mouse moves unless buttons are pressed, so simulation doesn't get window leave events when we leave its window" - ifTrue: "filter-out mouse moves unless buttons are pressed, so simulation doersn't get window leave events when we leave its window" [buttons = 0 ifTrue: [^nil]] ifFalse:"If the buttons are going down, make sure to add a mouse move event to the current position before the buttons are pressed." [((buttons bitAnd: 7) = 0 and: [(aMorphicEvent buttons bitAnd: 7) ~= 0]) ifTrue: [aClient queueForwardedEvent: { 1. aMorphicEvent timeStamp. translated x. translated y. 0. buttons >> 3. "Thanks dtl" 0. self windowIndex }]. buttons := aMorphicEvent buttons]. aClient queueForwardedEvent: { 1. aMorphicEvent timeStamp. translated x. translated y. buttons bitAnd: 7. "thanks Ron T." buttons >> 3. "Thanks dtl" 0. self windowIndex }! Item was added: + ----- Method: ThreadedFFIPlugin class>>moduleExportsName (in category 'translation') ----- + moduleExportsName + "To make the inclusion of the platform-specific plugin to work it can't use + its moduleName in the exports but must use the proper moduleName." + + ^ThreadedFFIPlugin moduleName! Item was changed: CCodeGenerator subclass: #VMPluginCodeGenerator + instanceVariableNames: 'pluginClass pluginFunctionsUsed inProgressSelectors inliningDone' - instanceVariableNames: 'pluginClass pluginName pluginFunctionsUsed inProgressSelectors inliningDone' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Translation to C'! !VMPluginCodeGenerator commentStamp: '<historical>' prior: 0! I generate code that can be loaded dynamically from external libraries (e.g., DSOs on Unix or DLLs on Windows)! Item was changed: ----- Method: VMPluginCodeGenerator>>emitExportsOn: (in category 'C code generator') ----- emitExportsOn: aStream "Store all the exported primitives in the form used by the internal named prim system." aStream cr; cr; nextPutAll:'#ifdef SQUEAK_BUILTIN_PLUGIN'. + self emitExportsNamed: pluginClass moduleName + pluginName: pluginClass moduleExportsName + on: aStream. - self emitExportsNamed: pluginName pluginName: pluginName on: aStream. aStream cr; nextPutAll: '#else /* ifdef SQ_BUILTIN_PLUGIN */'; cr; cr. self emitAccessorDepthsOn: aStream. aStream cr; nextPutAll: '#endif /* ifdef SQ_BUILTIN_PLUGIN */'; cr! Item was changed: ----- Method: VMPluginCodeGenerator>>pluginClass: (in category 'public') ----- pluginClass: aPluginClass "Set the plugin class and name when generating plugins. And for run-time use, answer the name string." | packageId | pluginClass := aPluginClass. - pluginName := pluginClass moduleName. packageId := self shortMonticelloDescriptionForClass: pluginClass. (packageId beginsWith: pluginClass name) ifTrue: [packageId := packageId allButFirst: pluginClass name size]. + (packageId beginsWith: pluginClass moduleName) ifTrue: + [packageId := packageId allButFirst: pluginClass moduleName size]. - (packageId beginsWith: pluginName) ifTrue: - [packageId := packageId allButFirst: pluginName size]. ^self declareModuleName: pluginClass moduleNameAndVersion, packageId! Item was removed: - ----- Method: VMPluginCodeGenerator>>pluginName: (in category 'public') ----- - pluginName: aString - "TPR - moved from CCodeGenerator" - "Set the plugin name when generating plugins." - pluginName := aString.!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.1694.mcz
by Esteban Lorenzano 24 Feb '16

24 Feb '16

Hi, Sorry but this will not work :( There are two reasons… this is the output of IA32FFIPlugin: void* IA32FFIPlugin_exports[][3] = { {"IA32FFIPlugin", "ffiLogCallsTo", (void*)ffiLogCallsTo}, {"IA32FFIPlugin", "getModuleName", (void*)getModuleName}, {"IA32FFIPlugin", "initialiseModule", (void*)initialiseModule}, {"IA32FFIPlugin", "primitiveCallout\000\002", (void*)primitiveCallout}, {"IA32FFIPlugin", "primitiveCalloutWithArgs\000\004", (void*)primitiveCalloutWithArgs}, {"IA32FFIPlugin", "primitiveCreateManualSurface\000\000", (void*)primitiveCreateManualSurface}, {"IA32FFIPlugin", "primitiveDestroyManualSurface\000\000", (void*)primitiveDestroyManualSurface}, {"IA32FFIPlugin", "primitiveFFIAllocate\000\001", (void*)primitiveFFIAllocate}, {"IA32FFIPlugin", "primitiveFFIDoubleAt\000\001", (void*)primitiveFFIDoubleAt}, {"IA32FFIPlugin", "primitiveFFIDoubleAtPut\000\001", (void*)primitiveFFIDoubleAtPut}, {"IA32FFIPlugin", "primitiveFFIFloatAt\000\001", (void*)primitiveFFIFloatAt}, {"IA32FFIPlugin", "primitiveFFIFloatAtPut\000\001", (void*)primitiveFFIFloatAtPut}, {"IA32FFIPlugin", "primitiveFFIFree\000\001", (void*)primitiveFFIFree}, {"IA32FFIPlugin", "primitiveFFIGetLastError\000\377", (void*)primitiveFFIGetLastError}, {"IA32FFIPlugin", "primitiveFFIIntegerAt\000\001", (void*)primitiveFFIIntegerAt}, {"IA32FFIPlugin", "primitiveFFIIntegerAtPut\000\001", (void*)primitiveFFIIntegerAtPut}, {"IA32FFIPlugin", "primitiveForceLoad\000\002", (void*)primitiveForceLoad}, {"IA32FFIPlugin", "primitiveLoadSymbolFromModule\000\002", (void*)primitiveLoadSymbolFromModule}, {"IA32FFIPlugin", "primitiveLogCallsTo\000\000", (void*)primitiveLogCallsTo}, {"IA32FFIPlugin", "primitiveSetManualSurfacePointer\000\000", (void*)primitiveSetManualSurfacePointer}, {"IA32FFIPlugin", "setInterpreter", (void*)setInterpreter}, {NULL, NULL, NULL} }; So, this: # define IA32FFIPlugin_exports SqueakFFIPrims_exports will just change the exports variable, but not the “IA32FFIPlugin” string… and defining: # define IA32FFIPlugin SqueakFFIPrims will not work either because preprocessor does not works inside strings :( how can we fix this? Esteban > On 23 Feb 2016, at 17:31, commits(a)source.squeak.org wrote: > > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1694.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.1694 > Author: eem > Time: 23 February 2016, 9:30:35.750871 am > UUID: e1381bbc-a5af-4a35-ac60-a739611c7e0e > Ancestors: VMMaker.oscog-eem.1693 > > Fix compilation of ThreadedFFIPlugin subclasses as internal plugins. > > =============== Diff against VMMaker.oscog-eem.1693 =============== > > Item was changed: > ----- Method: ThreadedFFIPlugin class>>generateCodeStringForPrimitives (in category 'translation') ----- > generateCodeStringForPrimitives > "Output a skeletal SqueakFFIPrims.c that includes the relevant FooFFIPlugin.c for > each subclass based on the identifyingPredefinedMacros the subclass defines." > > ^String streamContents: > [:s| > s nextPutAll: '/* Automatically generated by\ ' withCRs. > s nextPutAll: (CCodeGenerator monticelloDescriptionFor: self). > s cr; nextPutAll: ' */'. > s cr; cr; nextPut: $#. > (self allSubclasses sort: [:a :b| a name < b name]) do: > [:class | > class identifyingPredefinedMacros ifNotNil: > [:predefinedMacros| > s nextPutAll: 'if '. > class includingPredefinedMacros ifNotNil: > [:includingMacros| > includingMacros do: > [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPutAll: ') && ']. > s nextPut: $(]. > class excludingPredefinedMacros ifNotNil: > [:excludingMacros| > excludingMacros do: > [:predefinedMacro| s nextPutAll: '!!defined('; nextPutAll: predefinedMacro; nextPutAll: ') && ']. > s nextPut: $(]. > predefinedMacros > do: [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPut: $)] > separatedBy: [s nextPutAll: ' || ']. > class excludingPredefinedMacros ifNotNil: > [s nextPut: $)]. > class includingPredefinedMacros ifNotNil: > [s nextPut: $)]. > + s cr; cr; nextPutAll: '# define '; nextPutAll: class moduleName; nextPutAll: '_exports '; > + nextPutAll: self moduleName; nextPutAll: '_exports'. > + s cr; nextPutAll: '# include "'; nextPutAll: class moduleName; nextPutAll: '.c"'. > - s cr; cr; nextPutAll: '# include "'; nextPutAll: class moduleName; nextPutAll: '.c"'. > s cr; cr; nextPutAll: '#el']]. > s nextPutAll: 'se'. > #( 'As yet no FFI implementation appears to exist for your platform.' > 'Consider implementing it, starting by adding a subclass of ThreadedFFIPlugin.') do: > + [:msg| s cr; nextPutAll: '# error '; nextPutAll: msg]. > - [:msg| s cr; nextPutAll: '# error '; nextPutAll: msg]. > s cr; nextPutAll: '#endif'; cr]! >

3 6

[commit][3628] CogVM source as per VMMaker.oscog-eem.1694
by commits＠squeakvm.org 24 Feb '16

24 Feb '16

Revision: 3628 Author: eliot Date: 2016-02-23 09:42:03 -0800 (Tue, 23 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1694 Author: eem Time: 23 February 2016, 9:30:35.750871 am UUID: e1381bbc-a5af-4a35-ac60-a739611c7e0e Ancestors: VMMaker.oscog-eem.1693 General: Fix a bug in printHex: for 64-bits (faulty arithmetic). ThreadedFFIPlugin: Fix compilation of ThreadedFFIPlugin subclasses as internal plugins. Speed up ffiIntegerValueOf: by adding a tag test (harmless in our current crop of VMs) and cppIf: SPURVM as appropriate. Fix the remaining 64-bit issues in the ThreadedFFIPlugin. The X64SysVFFIPlugin now passes the test suite. The issues addressed are: Masks for restricting and signing integral return values must be declared as at least long (again the fact that a manifest integer constat's type defaults to int causes problems). Cast 1 << foo to 1 asUnsignedLong << foo in one place where it is required. Use isFloatObject: rather than floatClass to test for floats since this works for both SmallFloat64 and BoxedFloat64 on 64-bit Spur. Several pointer declarations needed to be e.g. <var: #ptr type: #'long *'>, not <var: #ptr type: #'int *'>. Several casts to int of of firstIndexableField: (which has tyype void *) were discarded. ExternalAddresses and the like need to be created with BytesPerWord or (self sizeof: #'void *'),, not 4. Slang/ThreadedFFIPlugin: To fix shifts in 64 bits, modify Slang to cast a manifest constant that is the receiver of a shift to long (via postpending 'L' to the numeric string). Mac OS build: Make makeall scripts current. Nuke QuickTime framework in the 64-bit build; there is no 64-bit QuickTime. Modified Paths: -------------- branches/Cog/build.macos32x86/makeall branches/Cog/build.macos32x86/makeallinstall branches/Cog/build.macos64x64/common/Makefile.flags branches/Cog/build.macos64x64/makeall branches/Cog/build.macos64x64/makeallinstall branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/makeall =================================================================== --- branches/Cog/build.macos32x86/makeall 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/build.macos32x86/makeall 2016-02-23 17:42:03 UTC (rev 3628) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -for d in newspeak.* squeak.*; do +for d in newspeak.* pharo.* squeak.*; do if test -d "$d"; then (cd ./$d;./mvm -A) else @@ -8,4 +8,4 @@ fi done echo no news is good news... -grep -w error: newspeak.*/LOG* squeak.*/LOG* +grep -w error: newspeak.*/LOG* pharo.* squeak.*/LOG* Modified: branches/Cog/build.macos32x86/makeallinstall =================================================================== --- branches/Cog/build.macos32x86/makeallinstall 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/build.macos32x86/makeallinstall 2016-02-23 17:42:03 UTC (rev 3628) @@ -5,9 +5,9 @@ REV=`grep 'SvnRawRevisionString.*Rev:' "\`dirname $0\`/../platforms/Cross/vm/sqSCCSVersion.h" \ | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` TAG=`date +%y.%U.`$REV -set -- Newspeak\ Virtual\ Machine Newspeak\ Spur\ Virtual\ Machine \ - Cog Cog\ Spur -for td in newspeak.cog.spur squeak.cog.v3 squeak.cog.spur; do +set -- Newspeak\ Spur\ Virtual\ Machine \ + Pharo Cog Cog\ Spur +for td in newspeak.cog.spur pharo.cog.spur squeak.cog.v3 squeak.cog.spur; do d=$td/installer PRODUCT=$1-$TAG.dmg if test -d "$d"; then Modified: branches/Cog/build.macos64x64/common/Makefile.flags =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-23 17:42:03 UTC (rev 3628) @@ -33,9 +33,10 @@ -Wno-sign-conversion -Wno-shorten-64-to-32 -Wpointer-sign -Wno-newline-eof \ -Wno-trigraphs -Wdeprecated-declarations +# N.B. No QuickTime framework; that is 32-bit only. FRAMEWORKS:=-fobjc-link-runtime \ -framework Foundation -framework OpenGL -framework Cocoa \ - -framework AudioToolbox -framework CoreAudio -framework QuickTime \ + -framework AudioToolbox -framework CoreAudio \ -framework SystemConfiguration \ -framework ApplicationServices -framework Security \ -framework QuartzCore Modified: branches/Cog/build.macos64x64/makeall =================================================================== --- branches/Cog/build.macos64x64/makeall 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/build.macos64x64/makeall 2016-02-23 17:42:03 UTC (rev 3628) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -for d in newspeak.* squeak.*; do +for d in newspeak.* pharo.* squeak.*; do if test -d "$d"; then (cd ./$d;./mvm -A) else @@ -8,4 +8,4 @@ fi done echo no news is good news... -grep -w error: newspeak.*/LOG* squeak.*/LOG* +grep -w error: newspeak.*/LOG* pharo.* squeak.*/LOG* Modified: branches/Cog/build.macos64x64/makeallinstall =================================================================== --- branches/Cog/build.macos64x64/makeallinstall 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/build.macos64x64/makeallinstall 2016-02-23 17:42:03 UTC (rev 3628) @@ -5,9 +5,9 @@ REV=`grep 'SvnRawRevisionString.*Rev:' "\`dirname $0\`/../platforms/Cross/vm/sqSCCSVersion.h" \ | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` TAG=`date +%y.%U.`$REV -set -- Newspeak\ Virtual\ Machine Newspeak\ Spur\ Virtual\ Machine \ - Cog Cog\ Spur -for td in newspeak.cog.v3 newspeak.cog.spur squeak.cog.v3 squeak.cog.spur; do +set -- Newspeak\ Spur\ Virtual\ Machine \ + Pharo Cog Cog\ Spur +for td in newspeak.cog.spur pharo.cog.spur squeak.cog.v3 squeak.cog.spur; do d=$td/installer PRODUCT=$1-$TAG.dmg if test -d "$d"; then Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-02-23 17:42:03 UTC (rev 3628) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e */ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-23 17:42:03 UTC (rev 3628) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 + CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e from - StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 + StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -3700,7 +3700,7 @@ closedPICRefersToUnmarkedObject(CogMethod *cPIC) { sqInt i; - usqInt object; + sqInt object; sqInt pc; if (!((isImmediate((cPIC->selector))) @@ -5883,12 +5883,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-02-23 17:42:03 UTC (rev 3628) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e from - CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2442,7 +2442,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1689"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1693"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17850,7 +17850,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - signed char accessorDepth; + sqInt accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -61538,7 +61538,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -75838,12 +75838,12 @@ void printHex(sqInt n) { - char buf[35]; + char buf[37]; sqInt len; /* large enough for a 64-bit value in hex plus the null plus 16 spaces */ - memset(buf,' ',34); + memset(buf,' ',36); len = sprintf(buf + 2 + 2 * BytesPerWord, "0x%lx", (unsigned long)(n)); printf("%s", buf + len); } Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-02-23 17:42:03 UTC (rev 3628) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e */ Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-23 17:42:03 UTC (rev 3628) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e from - CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2445,7 +2445,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1689"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1693"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17859,7 +17859,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - signed char accessorDepth; + sqInt accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -61547,7 +61547,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -75847,12 +75847,12 @@ void printHex(sqInt n) { - char buf[35]; + char buf[37]; sqInt len; /* large enough for a 64-bit value in hex plus the null plus 16 spaces */ - memset(buf,' ',34); + memset(buf,' ',36); len = sprintf(buf + 2 + 2 * BytesPerWord, "0x%lx", (unsigned long)(n)); printf("%s", buf + len); } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-02-23 17:42:03 UTC (rev 3628) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-22 19:11:27 UTC (rev 3627) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-23 17:42:03 UTC (rev 3628) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 + CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e from - StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 + StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2268,7 +2268,7 @@ static sqInt NoDbgRegParms addsrnimmror(AbstractInstruction * self_in_addsrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot) { - return (((AL << 28) | ((1 << 25) | ((AddOpcode << 21) | (1 << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); + return (((AL << 28) | ((1L << 25) | ((AddOpcode << 21) | (1L << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); } @@ -2279,7 +2279,7 @@ static sqInt NoDbgRegParms addrnimmror(AbstractInstruction * self_in_addrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot) { - return (((AL << 28) | ((1 << 25) | ((AddOpcode << 21) | (0 << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); + return (((AL << 28) | ((1L << 25) | ((AddOpcode << 21) | (0L << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); } @@ -2290,7 +2290,7 @@ static sqInt NoDbgRegParms addrnrm(AbstractInstruction * self_in_addrnrm, sqInt destReg, sqInt srcReg, sqInt addReg) { - return (((AL << 28) | ((0 << 25) | ((AddOpcode << 21) | (0 << 20)))) | ((srcReg << 16) | (destReg << 12))) | (addReg & 0xFFF); + return (((AL << 28) | ((0L << 25) | ((AddOpcode << 21) | (0L << 20)))) | ((srcReg << 16) | (destReg << 12))) | (addReg & 0xFFF); } @@ -2321,7 +2321,7 @@ static sqInt NoDbgRegParms andsrnimmror(AbstractInstruction * self_in_andsrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot) { - return (((AL << 28) | ((1 << 25) | ((AndOpcode << 21) | (1 << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); + return (((AL << 28) | ((1L << 25) | ((AndOpcode << 21) | (1L << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); } @@ -2332,7 +2332,7 @@ static sqInt NoDbgRegParms andrnimmror(AbstractInstruction * self_in_andrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot) { - return (((AL << 28) | ((1 << 25) | ((AndOpcode << 21) | (0 << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); + return (((AL << 28) | ((1L << 25) | ((AndOpcode << 21) | (0L << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); } @@ -2343,7 +2343,7 @@ static sqInt NoDbgRegParms bicsrnimmror(AbstractInstruction * self_in_bicsrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot) { - return (((AL << 28) | ((1 << 25) | ((BicOpcode << 21) | (1 << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); + return (((AL << 28) | ((1L << 25) | ((BicOpcode << 21) | (1L << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); } @@ -2420,7 +2420,7 @@ || (instructionIsBL(self_in_callTargetFromReturnAddress, call))); /* begin extractOffsetFromBL: */ relativeJump = call & 0xFFFFFF; - relativeJump = (relativeJump & (1 << 23) + relativeJump = (relativeJump & (1L << 23) ? ((int) ((relativeJump | 0x3F000000) << 2)) : relativeJump << 2); callDistance = relativeJump; @@ -2569,7 +2569,7 @@ } for (i1 = 2; i1 <= 30; i1 += 2) { - if ((value & (((0xFF << i1) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i1)))) == value) { + if ((value & (((0xFFL << i1) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i1)))) == value) { return 4; } @@ -2593,7 +2593,7 @@ } for (i2 = 2; i2 <= 30; i2 += 2) { - if ((value1 & (((0xFF << i2) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i2)))) == value1) { + if ((value1 & (((0xFFL << i2) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i2)))) == value1) { return 4; } @@ -2617,7 +2617,7 @@ } for (i3 = 2; i3 <= 30; i3 += 2) { - if ((constant2 & (((0xFF << i3) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i3)))) == constant2) { + if ((constant2 & (((0xFFL << i3) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i3)))) == constant2) { return 4; } @@ -2764,7 +2764,7 @@ hiReg = ((self_in_concretizeCMPSMULL->operands))[0]; loReg = ((self_in_concretizeCMPSMULL->operands))[1]; /* begin machineCodeAt:put: */ - aWord = (((((AL << 28) | ((0 << 25) | ((CmpOpcode << 21) | (1 << 20)))) | ((hiReg << 16) | (0 << 12))) + (0x1F << 7)) + (2 << 5)) + loReg; + aWord = (((((AL << 28) | ((0L << 25) | ((CmpOpcode << 21) | (1L << 20)))) | ((hiReg << 16) | (0L << 12))) + (0x1FL << 7)) + (2L << 5)) + loReg; ((self_in_concretizeCMPSMULL->machineCode))[0 / 4] = aWord; return ((self_in_concretizeCMPSMULL->machineCodeSize) = 4); } @@ -2787,7 +2787,7 @@ dispatchConcretize(self_in_concretizeConditionalInstruction); (self_in_concretizeConditionalInstruction->conditionOrNil) = savedCond; for (i = 0; i < ((self_in_concretizeConditionalInstruction->machineCodeSize)); i += 4) { - instr = (((((self_in_concretizeConditionalInstruction->machineCode))[i / 4]) | (15 << 28)) - (15 << 28)); + instr = (((((self_in_concretizeConditionalInstruction->machineCode))[i / 4]) | (15L << 28)) - (15L << 28)); /* begin machineCodeAt:put: */ aWord = instr | ((((self_in_concretizeConditionalInstruction->conditionOrNil)) & 15) << 28); ((self_in_concretizeConditionalInstruction->machineCode))[i / 4] = aWord; @@ -2853,7 +2853,7 @@ loResultReg = (srcB = ((self_in_concretizeSMULL->operands))[1]); hiResultReg = RISCTempReg; /* begin machineCodeAt:put: */ - aWord = (((((AL << 28) | ((0 << 25) | ((6 << 21) | (0 << 20)))) | ((hiResultReg << 16) | (loResultReg << 12))) + (srcA << 8)) + (9 << 4)) + srcB; + aWord = (((((AL << 28) | ((0L << 25) | ((6L << 21) | (0L << 20)))) | ((hiResultReg << 16) | (loResultReg << 12))) + (srcA << 8)) + (9L << 4)) + srcB; ((self_in_concretizeSMULL->machineCode))[0 / 4] = aWord; return ((self_in_concretizeSMULL->machineCodeSize) = 4); } @@ -2881,10 +2881,10 @@ dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft) { if (shft == 0) { - return (((AL << 28) | ((0 << 25) | ((armOpcode << 21) | (1 << 20)))) | ((srcReg << 16) | (destReg << 12))) | (addReg & 0xFFF); + return (((AL << 28) | ((0L << 25) | ((armOpcode << 21) | (1L << 20)))) | ((srcReg << 16) | (destReg << 12))) | (addReg & 0xFFF); } else { - return (((AL << 28) | ((0 << 25) | ((armOpcode << 21) | (1 << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((shft << 7) | 32) | addReg) & 0xFFF); + return (((AL << 28) | ((0L << 25) | ((armOpcode << 21) | (1L << 20)))) | ((srcReg << 16) | (destReg << 12))) | ((((shft << 7) | 32) | addReg) & 0xFFF); } } @@ -3438,7 +3438,7 @@ jumpTarget = jumpTarget1; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord43 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -3472,7 +3472,7 @@ jumpTarget2 = jumpTarget11; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord44 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -3918,7 +3918,7 @@ case Stop: /* begin concretizeStop */ - ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((AL << 28) | ((66 << 20) | (7 << 4))); + ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((AL << 28) | ((66L << 20) | (7L << 4))); ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -3941,7 +3941,7 @@ flagsOrOpcode = (negate ? inverseOpcodeFor(self_in_dispatchConcretize, AddOpcode) : AddOpcode); - aWord4 = (((AL << 28) | ((1 << 25) | ((flagsOrOpcode << 21) | (1 << 20)))) | ((rn << 16) | (rd << 12))) | ((((((usqInt) 0) >> 1) << 8) | value) & 0xFFF); + aWord4 = (((AL << 28) | ((1L << 25) | ((flagsOrOpcode << 21) | (1L << 20)))) | ((rn << 16) | (rd << 12))) | ((((((usqInt) 0) >> 1) << 8) | value) & 0xFFF); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord4; ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -3949,7 +3949,7 @@ goto l1; } for (i = 2; i <= 30; i += 2) { - if ((value & (((0xFF << i) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i)))) == value) { + if ((value & (((0xFFL << i) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i)))) == value) { rot = 32 - i; immediate = (((usqInt) value) >> i) | ((value << (32 - i)) & 0xFFFFFFFFUL); negate = val != value; @@ -3957,7 +3957,7 @@ flagsOrOpcode1 = (negate ? inverseOpcodeFor(self_in_dispatchConcretize, AddOpcode) : AddOpcode); - aWord4 = (((AL << 28) | ((1 << 25) | ((flagsOrOpcode1 << 21) | (1 << 20)))) | ((rn << 16) | (rd << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); + aWord4 = (((AL << 28) | ((1L << 25) | ((flagsOrOpcode1 << 21) | (1L << 20)))) | ((rn << 16) | (rd << 12))) | ((((((usqInt) rot) >> 1) << 8) | immediate) & 0xFFF); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord4; ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -3973,7 +3973,7 @@ /* let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF */ if (val > 0) { hb = highBit(val); - if ((1 << hb) == (val + 1)) { + if ((1L << hb) == (val + 1)) { /* MVN temp, #0, making 0xffffffff */ /* begin machineCodeAt:put: */ @@ -3992,7 +3992,7 @@ rd2 = rn4; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord45 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4000,7 +4000,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord45; instrOffset8 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset8 / 4] = ((((AL << 28) | ((0 << 25) | ((AddOpcode << 21) | (1 << 20)))) | ((rn4 << 16) | (rd2 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset8 / 4] = ((((AL << 28) | ((0L << 25) | ((AddOpcode << 21) | (1L << 20)))) | ((rn4 << 16) | (rd2 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset8 + 4); return; @@ -4021,7 +4021,7 @@ flagsOrOpcode2 = (invert ? inverseOpcodeFor(self_in_dispatchConcretize, AndOpcode) : AndOpcode); - aWord5 = (((AL << 28) | ((1 << 25) | ((flagsOrOpcode2 << 21) | (1 << 20)))) | ((rn1 << 16) | (rn1 << 12))) | ((((((usqInt) 0) >> 1) << 8) | value1) & 0xFFF); + aWord5 = (((AL << 28) | ((1L << 25) | ((flagsOrOpcode2 << 21) | (1L << 20)))) | ((rn1 << 16) | (rn1 << 12))) | ((((((usqInt) 0) >> 1) << 8) | value1) & 0xFFF); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord5; ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -4029,7 +4029,7 @@ goto l2; } for (i1 = 2; i1 <= 30; i1 += 2) { - if ((value1 & (((0xFF << i1) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i1)))) == value1) { + if ((value1 & (((0xFFL << i1) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i1)))) == value1) { rot1 = 32 - i1; immediate1 = (((usqInt) value1) >> i1) | ((value1 << (32 - i1)) & 0xFFFFFFFFUL); invert = val1 != value1; @@ -4037,7 +4037,7 @@ flagsOrOpcode3 = (invert ? inverseOpcodeFor(self_in_dispatchConcretize, AndOpcode) : AndOpcode); - aWord5 = (((AL << 28) | ((1 << 25) | ((flagsOrOpcode3 << 21) | (1 << 20)))) | ((rn1 << 16) | (rn1 << 12))) | ((((((usqInt) rot1) >> 1) << 8) | immediate1) & 0xFFF); + aWord5 = (((AL << 28) | ((1L << 25) | ((flagsOrOpcode3 << 21) | (1L << 20)))) | ((rn1 << 16) | (rn1 << 12))) | ((((((usqInt) rot1) >> 1) << 8) | immediate1) & 0xFFF); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord5; ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -4054,7 +4054,7 @@ /* let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF */ if (val1 > 0) { hb1 = highBit(val1); - if ((1 << hb1) == (val1 + 1)) { + if ((1L << hb1) == (val1 + 1)) { /* MVN temp, #0, making 0xffffffff */ /* begin machineCodeAt:put: */ @@ -4078,18 +4078,18 @@ /* begin rotateable8bitImmediate:ifTrue:ifFalse: */ if ((val5 & 0xFF) == val5) { /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((AndOpcode << 21) | (1 << 20)))) | ((rn5 << 16) | (rd3 << 12))) | ((((((usqInt) 0) >> 1) << 8) | val5) & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1L << 25) | ((AndOpcode << 21) | (1L << 20)))) | ((rn5 << 16) | (rd3 << 12))) | ((((((usqInt) 0) >> 1) << 8) | val5) & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = 4); return; goto l22; } for (i13 = 2; i13 <= 30; i13 += 2) { - if ((val5 & (((0xFF << i13) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i13)))) == val5) { + if ((val5 & (((0xFFL << i13) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i13)))) == val5) { rot11 = 32 - i13; immediate14 = (((usqInt) val5) >> i13) | ((val5 << (32 - i13)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((AndOpcode << 21) | (1 << 20)))) | ((rn5 << 16) | (rd3 << 12))) | ((((((usqInt) rot11) >> 1) << 8) | immediate14) & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1L << 25) | ((AndOpcode << 21) | (1L << 20)))) | ((rn5 << 16) | (rd3 << 12))) | ((((((usqInt) rot11) >> 1) << 8) | immediate14) & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -4100,7 +4100,7 @@ /* let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF */ if (val5 > 0) { hb5 = highBit(val5); - if ((1 << hb5) == (val5 + 1)) { + if ((1L << hb5) == (val5 + 1)) { /* MVN temp, #0, making 0xffffffff */ /* begin machineCodeAt:put: */ @@ -4119,7 +4119,7 @@ rd22 = rn24; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord79 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4127,7 +4127,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord79; instrOffset27 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset27 / 4] = ((((AL << 28) | ((0 << 25) | ((AndOpcode << 21) | (1 << 20)))) | ((rn24 << 16) | (rd22 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset27 / 4] = ((((AL << 28) | ((0L << 25) | ((AndOpcode << 21) | (1L << 20)))) | ((rn24 << 16) | (rd22 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset27 + 4); return; @@ -4158,7 +4158,7 @@ goto l3; } for (i2 = 2; i2 <= 30; i2 += 2) { - if ((value2 & (((0xFF << i2) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i2)))) == value2) { + if ((value2 & (((0xFFL << i2) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i2)))) == value2) { rot2 = 32 - i2; immediate2 = (((usqInt) value2) >> i2) | ((value2 << (32 - i2)) & 0xFFFFFFFFUL); invert1 = val2 != value2; @@ -4181,7 +4181,7 @@ /* let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF */ hb2 = highBit(((self_in_dispatchConcretize->operands))[0]); - if ((1 << hb2) == (val2 + 1)) { + if ((1L << hb2) == (val2 + 1)) { /* MVN temp reg, 0, making 0xffffffff */ /* begin machineCodeAt:put: */ @@ -4200,7 +4200,7 @@ rd4 = rn6; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord47 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4208,7 +4208,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord47; instrOffset9 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset9 / 4] = ((((AL << 28) | ((0 << 25) | ((AndOpcode << 21) | (1 << 20)))) | ((rn6 << 16) | (rd4 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset9 / 4] = ((((AL << 28) | ((0L << 25) | ((AndOpcode << 21) | (1L << 20)))) | ((rn6 << 16) | (rd4 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset9 + 4); return; } @@ -4235,7 +4235,7 @@ flagsOrOpcode4 = (negate1 ? inverseOpcodeFor(self_in_dispatchConcretize, CmpOpcode) : CmpOpcode); - aWord7 = (((AL << 28) | ((1 << 25) | ((flagsOrOpcode4 << 21) | (1 << 20)))) | ((rn2 << 16) | (rd1 << 12))) | ((((((usqInt) 0) >> 1) << 8) | value3) & 0xFFF); + aWord7 = (((AL << 28) | ((1L << 25) | ((flagsOrOpcode4 << 21) | (1L << 20)))) | ((rn2 << 16) | (rd1 << 12))) | ((((((usqInt) 0) >> 1) << 8) | value3) & 0xFFF); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord7; ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -4243,7 +4243,7 @@ goto l4; } for (i3 = 2; i3 <= 30; i3 += 2) { - if ((value3 & (((0xFF << i3) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i3)))) == value3) { + if ((value3 & (((0xFFL << i3) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i3)))) == value3) { rot3 = 32 - i3; immediate3 = (((usqInt) value3) >> i3) | ((value3 << (32 - i3)) & 0xFFFFFFFFUL); negate1 = val3 != value3; @@ -4251,7 +4251,7 @@ flagsOrOpcode5 = (negate1 ? inverseOpcodeFor(self_in_dispatchConcretize, CmpOpcode) : CmpOpcode); - aWord7 = (((AL << 28) | ((1 << 25) | ((flagsOrOpcode5 << 21) | (1 << 20)))) | ((rn2 << 16) | (rd1 << 12))) | ((((((usqInt) rot3) >> 1) << 8) | immediate3) & 0xFFF); + aWord7 = (((AL << 28) | ((1L << 25) | ((flagsOrOpcode5 << 21) | (1L << 20)))) | ((rn2 << 16) | (rd1 << 12))) | ((((((usqInt) rot3) >> 1) << 8) | immediate3) & 0xFFF); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord7; ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -4267,7 +4267,7 @@ /* let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF */ if (val3 > 0) { hb3 = highBit(val3); - if ((1 << hb3) == (val3 + 1)) { + if ((1L << hb3) == (val3 + 1)) { /* MVN temp, #0, making 0xffffffff */ /* begin machineCodeAt:put: */ @@ -4286,7 +4286,7 @@ rd5 = 0; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord48 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4294,7 +4294,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord48; instrOffset10 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset10 / 4] = ((((AL << 28) | ((0 << 25) | ((CmpOpcode << 21) | (1 << 20)))) | ((rn7 << 16) | (rd5 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset10 / 4] = ((((AL << 28) | ((0L << 25) | ((CmpOpcode << 21) | (1L << 20)))) | ((rn7 << 16) | (rd5 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset10 + 4); return; @@ -4313,18 +4313,18 @@ /* begin rotateable8bitImmediate:ifTrue:ifFalse: */ if ((val6 & 0xFF) == val6) { /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((OrOpcode << 21) | (1 << 20)))) | ((rn8 << 16) | (rd6 << 12))) | ((((((usqInt) 0) >> 1) << 8) | val6) & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1L << 25) | ((OrOpcode << 21) | (1L << 20)))) | ((rn8 << 16) | (rd6 << 12))) | ((((((usqInt) 0) >> 1) << 8) | val6) & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = 4); return; goto l17; } for (i14 = 2; i14 <= 30; i14 += 2) { - if ((val6 & (((0xFF << i14) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i14)))) == val6) { + if ((val6 & (((0xFFL << i14) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i14)))) == val6) { rot12 = 32 - i14; immediate15 = (((usqInt) val6) >> i14) | ((val6 << (32 - i14)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((OrOpcode << 21) | (1 << 20)))) | ((rn8 << 16) | (rd6 << 12))) | ((((((usqInt) rot12) >> 1) << 8) | immediate15) & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1L << 25) | ((OrOpcode << 21) | (1L << 20)))) | ((rn8 << 16) | (rd6 << 12))) | ((((((usqInt) rot12) >> 1) << 8) | immediate15) & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -4335,7 +4335,7 @@ /* let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF */ if (val6 > 0) { hb6 = highBit(val6); - if ((1 << hb6) == (val6 + 1)) { + if ((1L << hb6) == (val6 + 1)) { /* MVN temp, #0, making 0xffffffff */ /* begin machineCodeAt:put: */ @@ -4354,7 +4354,7 @@ rd23 = rn25; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord80 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4362,7 +4362,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord80; instrOffset28 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset28 / 4] = ((((AL << 28) | ((0 << 25) | ((OrOpcode << 21) | (1 << 20)))) | ((rn25 << 16) | (rd23 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset28 / 4] = ((((AL << 28) | ((0L << 25) | ((OrOpcode << 21) | (1L << 20)))) | ((rn25 << 16) | (rd23 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset28 + 4); return; @@ -4384,7 +4384,7 @@ goto l6; } for (i11 = 2; i11 <= 30; i11 += 2) { - if ((word & (((0xFF << i11) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i11)))) == word) { + if ((word & (((0xFFL << i11) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i11)))) == word) { rot4 = 32 - i11; immediate4 = (((usqInt) word) >> i11) | ((word << (32 - i11)) & 0xFFFFFFFFUL); reg = ((self_in_dispatchConcretize->operands))[1]; @@ -4412,7 +4412,7 @@ goto l23; } for (i4 = 2; i4 <= 30; i4 += 2) { - if (((-word) & (((0xFF << i4) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i4)))) == (-word)) { + if (((-word) & (((0xFFL << i4) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i4)))) == (-word)) { rot4 = 32 - i4; immediate4 = (((usqInt) (-word)) >> i4) | (((-word) << (32 - i4)) & 0xFFFFFFFFUL); reg = ((self_in_dispatchConcretize->operands))[1]; @@ -4431,7 +4431,7 @@ rd7 = rn9; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord50 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4439,7 +4439,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord50; instrOffset11 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset11 / 4] = ((((AL << 28) | ((0 << 25) | ((SubOpcode << 21) | (1 << 20)))) | ((rn9 << 16) | (rd7 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset11 / 4] = ((((AL << 28) | ((0L << 25) | ((SubOpcode << 21) | (1L << 20)))) | ((rn9 << 16) | (rd7 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset11 + 4); return; @@ -4462,7 +4462,7 @@ goto l7; } for (i5 = 2; i5 <= 30; i5 += 2) { - if ((constant & (((0xFF << i5) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i5)))) == constant) { + if ((constant & (((0xFFL << i5) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i5)))) == constant) { rot5 = 32 - i5; immediate5 = (((usqInt) constant) >> i5) | ((constant << (32 - i5)) & 0xFFFFFFFFUL); reg1 = ((self_in_dispatchConcretize->operands))[1]; @@ -4481,7 +4481,7 @@ rd8 = rn10; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord51 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4489,7 +4489,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord51; instrOffset12 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset12 / 4] = ((((AL << 28) | ((0 << 25) | ((TstOpcode << 21) | (1 << 20)))) | ((rn10 << 16) | (rd8 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset12 / 4] = ((((AL << 28) | ((0L << 25) | ((TstOpcode << 21) | (1L << 20)))) | ((rn10 << 16) | (rd8 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset12 + 4); return; @@ -4510,7 +4510,7 @@ flagsOrOpcode6 = (invert2 ? inverseOpcodeFor(self_in_dispatchConcretize, XorOpcode) : XorOpcode); - aWord10 = (((AL << 28) | ((1 << 25) | ((flagsOrOpcode6 << 21) | (1 << 20)))) | ((rn3 << 16) | (rn3 << 12))) | ((((((usqInt) 0) >> 1) << 8) | value4) & 0xFFF); + aWord10 = (((AL << 28) | ((1L << 25) | ((flagsOrOpcode6 << 21) | (1L << 20)))) | ((rn3 << 16) | (rn3 << 12))) | ((((((usqInt) 0) >> 1) << 8) | value4) & 0xFFF); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord10; ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -4518,7 +4518,7 @@ goto l8; } for (i6 = 2; i6 <= 30; i6 += 2) { - if ((value4 & (((0xFF << i6) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i6)))) == value4) { + if ((value4 & (((0xFFL << i6) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i6)))) == value4) { rot6 = 32 - i6; immediate6 = (((usqInt) value4) >> i6) | ((value4 << (32 - i6)) & 0xFFFFFFFFUL); invert2 = val4 != value4; @@ -4526,7 +4526,7 @@ flagsOrOpcode7 = (invert2 ? inverseOpcodeFor(self_in_dispatchConcretize, XorOpcode) : XorOpcode); - aWord10 = (((AL << 28) | ((1 << 25) | ((flagsOrOpcode7 << 21) | (1 << 20)))) | ((rn3 << 16) | (rn3 << 12))) | ((((((usqInt) rot6) >> 1) << 8) | immediate6) & 0xFFF); + aWord10 = (((AL << 28) | ((1L << 25) | ((flagsOrOpcode7 << 21) | (1L << 20)))) | ((rn3 << 16) | (rn3 << 12))) | ((((((usqInt) rot6) >> 1) << 8) | immediate6) & 0xFFF); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord10; ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -4543,7 +4543,7 @@ /* let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF */ if (val4 > 0) { hb4 = highBit(val4); - if ((1 << hb4) == (val4 + 1)) { + if ((1L << hb4) == (val4 + 1)) { /* MVN temp, #0, making 0xffffffff */ /* begin machineCodeAt:put: */ @@ -4567,18 +4567,18 @@ /* begin rotateable8bitImmediate:ifTrue:ifFalse: */ if ((val7 & 0xFF) == val7) { /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((XorOpcode << 21) | (1 << 20)))) | ((rn11 << 16) | (rd9 << 12))) | ((((((usqInt) 0) >> 1) << 8) | val7) & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1L << 25) | ((XorOpcode << 21) | (1L << 20)))) | ((rn11 << 16) | (rd9 << 12))) | ((((((usqInt) 0) >> 1) << 8) | val7) & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = 4); return; goto l24; } for (i15 = 2; i15 <= 30; i15 += 2) { - if ((val7 & (((0xFF << i15) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i15)))) == val7) { + if ((val7 & (((0xFFL << i15) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i15)))) == val7) { rot13 = 32 - i15; immediate16 = (((usqInt) val7) >> i15) | ((val7 << (32 - i15)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((XorOpcode << 21) | (1 << 20)))) | ((rn11 << 16) | (rd9 << 12))) | ((((((usqInt) rot13) >> 1) << 8) | immediate16) & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1L << 25) | ((XorOpcode << 21) | (1L << 20)))) | ((rn11 << 16) | (rd9 << 12))) | ((((((usqInt) rot13) >> 1) << 8) | immediate16) & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = 4); return; @@ -4589,7 +4589,7 @@ /* let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF */ if (val7 > 0) { hb7 = highBit(val7); - if ((1 << hb7) == (val7 + 1)) { + if ((1L << hb7) == (val7 + 1)) { /* MVN temp, #0, making 0xffffffff */ /* begin machineCodeAt:put: */ @@ -4608,7 +4608,7 @@ rd24 = rn26; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord81 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4616,7 +4616,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord81; instrOffset29 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset29 / 4] = ((((AL << 28) | ((0 << 25) | ((XorOpcode << 21) | (1 << 20)))) | ((rn26 << 16) | (rd24 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset29 / 4] = ((((AL << 28) | ((0L << 25) | ((XorOpcode << 21) | (1L << 20)))) | ((rn26 << 16) | (rd24 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset29 + 4); return; @@ -4633,7 +4633,7 @@ rd10 = rn12; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord53 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4641,7 +4641,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord53; instrOffset13 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset13 / 4] = ((((AL << 28) | ((0 << 25) | ((AddOpcode << 21) | (1 << 20)))) | ((rn12 << 16) | (rd10 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset13 / 4] = ((((AL << 28) | ((0L << 25) | ((AddOpcode << 21) | (1L << 20)))) | ((rn12 << 16) | (rd10 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset13 + 4); return; @@ -4652,7 +4652,7 @@ rd11 = rn13; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord54 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4660,7 +4660,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord54; instrOffset14 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset14 / 4] = ((((AL << 28) | ((0 << 25) | ((AndOpcode << 21) | (1 << 20)))) | ((rn13 << 16) | (rd11 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset14 / 4] = ((((AL << 28) | ((0L << 25) | ((AndOpcode << 21) | (1L << 20)))) | ((rn13 << 16) | (rd11 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset14 + 4); return; @@ -4671,7 +4671,7 @@ rd12 = 0; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); /* begin machineCodeAt:put: */ aWord55 = ldrrnplusimm(self_in_dispatchConcretize, ConcreteIPReg, PC, (((((self_in_dispatchConcretize->dependent))->address)) >= (((self_in_dispatchConcretize->address)) + 8) ? 1 @@ -4679,7 +4679,7 @@ ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord55; instrOffset15 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ - ((self_in_dispatchConcretize->machineCode))[instrOffset15 / 4] = ((((AL << 28) | ((0 << 25) | ((CmpOpcode << 21) | (1 << 20)))) | ((rn14 << 16) | (rd12 << 12))) | (ConcreteIPReg & 0xFFF)); + ((self_in_dispatchConcretize->machineCode))[instrOffset15 / 4] = ((((AL << 28) | ((0L << 25) | ((CmpOpcode << 21) | (1L << 20)))) | ((rn14 << 16) | (rd12 << 12))) | (ConcreteIPReg & 0xFFF)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset15 + 4); return; @@ -4690,7 +4690,7 @@ rd13 = rn15; /* begin moveCw:intoR: */ assert(addressIsInCurrentCompilation((((self_in_dispatchConcretize->dependent))->address))); - assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1 << 12)); + assert((abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))) < (1L << 12)); @@ Diff output truncated at 50000 characters. @@

3 2

VM Maker: VMMaker.oscog-eem.1698.mcz
by commits＠source.squeak.org 24 Feb '16

24 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1698.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1698 Author: eem Time: 23 February 2016, 9:46:11.903576 pm UUID: 5135ebff-13d3-4d8c-8bce-ed314399b14e Ancestors: VMMaker.oscog-eem.1697 Fix a wild goose chase. ake sure that simulated translate dprmitives fail if given the wrong types of bits arrays. This fixes simulated aByteString asUppercase which uses the primitiveTranslateStringWithTable primitive with the UppercasingTable. When UppercasingTable is a wide string the primitive should fail. Add tests for 16-bit and 64-bit indexable objects to SpurMemoryManager. Fix simulation of literal32BeforeFollowingAddress: =============== Diff against VMMaker.oscog-eem.1697 =============== Item was changed: ----- Method: CogClass>>cCoerceSimple:to: (in category 'translation support') ----- cCoerceSimple: value to: cTypeString <doNotGenerate> "Type coercion for translation and simulation. For simulation answer a suitable surrogate for the struct types" ^cTypeString caseOf: { [#'unsigned long'] -> [value]. + [#'unsigned int'] -> [value]. [#sqInt] -> [value]. [#usqInt] -> [value]. [#sqLong] -> [value]. [#usqLong] -> [value]. [#'AbstractInstruction *'] -> [value]. [#'BytecodeFixup *'] -> [value]. [#'CogMethod *'] -> [value]. [#'char *'] -> [value]. [#'sqInt *'] -> [value]. [#'void *'] -> [value]. [#void] -> [value]. [#'void (*)()'] -> [value]. [#'void (*)(void)'] -> [value]. [#'unsigned long (*)(void)'] -> [value]. [#'void (*)(unsigned long,unsigned long)'] -> [value] }! Item was changed: ----- Method: CogInLineLiteralsX64Compiler>>literal32BeforeFollowingAddress: (in category 'inline cacheing') ----- literal32BeforeFollowingAddress: followingAddress "Answer the 32-bit literal embedded in the instruction immediately preceding followingAddress." + ^cogit - ^self cCoerceSimple: (self unalignedLong32At: followingAddress - 4) to: #'unsigned int'! Item was changed: ----- Method: InterpreterPlugin>>translatedPrimitiveArgument:ofType:using: (in category 'simulation') ----- translatedPrimitiveArgument: index ofType: cTypeString using: aCCodeGenerator + | oop unitSize | - | oop | oop := interpreterProxy stackValue: interpreterProxy methodArgumentCount - index. (interpreterProxy isOopForwarded: oop) ifTrue: [^nil]. cTypeString last == $* ifTrue: + [unitSize := self sizeof: (aCCodeGenerator baseTypeForPointerType: cTypeString) asSymbol. + unitSize caseOf: { + [1] -> [(interpreterProxy isBytes: oop) ifFalse: [^nil]]. + [2] -> [(interpreterProxy isShorts: oop) ifFalse: [^nil]]. + [4] -> [(interpreterProxy isWords: oop) ifFalse: [^nil]]. + [8] -> [(interpreterProxy isLong64s: oop) ifFalse: [^nil]] } + otherwise: [^nil]. + ^ObjectProxyForTranslatedPrimitiveSimulation new - [^ObjectProxyForTranslatedPrimitiveSimulation new interpreter: interpreterProxy oop: oop + unitSize: unitSize]. - unitSize: (self sizeof: (aCCodeGenerator baseTypeForPointerType: cTypeString) asSymbol)]. ((interpreterProxy isIntegerObject: oop) and: [aCCodeGenerator isIntegralCType: cTypeString]) ifTrue: [^interpreterProxy integerValueOf: oop]. self halt! Item was changed: ----- Method: Spur64BitMemoryManager>>isWordsNonImm: (in category 'object testing') ----- isWordsNonImm: objOop "Answer if the argument contains only indexable words (no oops). See comment in formatOf:" + ^(self formatOf: objOop) between: self firstLongFormat and: self firstShortFormat - 1! - ^(self formatOf: objOop) between: self firstLongFormat and: self firstLongFormat + 1! Item was added: + ----- Method: SpurMemoryManager>>isLong64s: (in category 'object testing') ----- + isLong64s: oop + "Answer if the argument contains only indexable 64-bit double words (no oops). See comment in formatOf:" + + ^(self isNonImmediate: oop) + and: [self isLong64sNonImm: oop]! Item was added: + ----- Method: SpurMemoryManager>>isLong64sNonImm: (in category 'object testing') ----- + isLong64sNonImm: objOop + "Answer if the argument contains only indexable 64-bit double words (no oops). See comment in formatOf:" + + ^(self formatOf: objOop) = self sixtyFourBitIndexableFormat! Item was added: + ----- Method: SpurMemoryManager>>isShorts: (in category 'object testing') ----- + isShorts: oop + "Answer if the argument contains only indexable 16-bit half words (no oops). See comment in formatOf:" + + ^(self isNonImmediate: oop) + and: [self isShortsNonImm: oop]! Item was added: + ----- Method: SpurMemoryManager>>isShortsNonImm: (in category 'object testing') ----- + isShortsNonImm: objOop + "Answer if the argument contains only indexable 16-bit half words (no oops). See comment in formatOf:" + + ^(self formatOf: objOop) between: self firstShortFormat and: self firstByteFormat - 1!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.1696.mcz
by Nicolas Cellier 24 Feb '16

24 Feb '16

2016-02-24 1:35 GMT+01:00 <commits(a)source.squeak.org>: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1696.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.1696 > Author: eem > Time: 23 February 2016, 4:35:02.71435 pm > UUID: 4db47df6-c329-44ca-a255-7483a9cac28f > Ancestors: VMMaker.oscog-tfel.1695 > > Fix serious bug in jitted perform: primitive. Thanks to Stéphane Ducasse > for finding and to Levente Uzoni for diagnosing Rendons à Stéphane Rollandin ce qui n'est pas à César... > the bug. If the argument count is one greater than the max number of > register aerguments (2 in Spur, hence perform:with:with:) then the code to > remove the receiver and arguments from the stack forgot to remove the > receiver and selector. > > =============== Diff against VMMaker.oscog-tfel.1695 =============== > > Item was changed: > ----- Method: StackToRegisterMappingCogit>>adjustArgumentsForPerform: > (in category 'primitive generators') ----- > adjustArgumentsForPerform: numArgs > "Generate code to adjust the possibly stacked arguments immediately > before jumping to a method looked up by a perform primitive." > self assert: self numRegArgs <= 2. > self assert: numArgs >= 1. > numArgs <= self numRegArgs ifTrue: > [numArgs = 2 ifTrue: > [self MoveR: Arg1Reg R: Arg0Reg]. > ^self]. > > + "If the arity is one more than the max numRegArgs, the receiver > and all arguments have to be removed from the stack." > self numRegArgs + 1 = numArgs ifTrue: > [backEnd hasLinkRegister > ifTrue: > + [self numRegArgs = 2 > + ifTrue: > + [self MoveMw: 0 r: SPReg > R: Arg1Reg. > + self MoveMw: objectMemory > wordSize r: SPReg R: Arg0Reg] > + ifFalse: > + [self MoveMw: 0 r: SPReg > R: Arg0Reg]. > + self AddCq: numArgs + 1 * objectMemory > wordSize R: SPReg] > - [self numRegArgs = 2 ifTrue: > - [self PopR: Arg1Reg]. > - self PopR: Arg0Reg] > ifFalse: > + [self MoveMw: 0 r: SPReg R: TempReg. "save > retpc" > + self numRegArgs = 2 > + ifTrue: > + [self MoveMw: objectMemory > wordSize r: SPReg R: Arg1Reg. > + self MoveMw: objectMemory > wordSize * 2 r: SPReg R: Arg0Reg] > + ifFalse: > + [self MoveMw: objectMemory > wordSize r: SPReg R: Arg0Reg]. > + self AddCq: numArgs + 1 * objectMemory > wordSize R: SPReg. > + self MoveR: TempReg Mw: 0 r: SPReg > "Overwrite pushed receiver; ReceiverResultReg already contains receiver."]. > - [self PopR: TempReg. "save retpc" > - self numRegArgs = 2 ifTrue: > - [self PopR: Arg1Reg]. > - self MoveMw: 0 r: SPReg R: Arg0Reg. > - self MoveR: TempReg Mw: 0 r: SPReg]. > ^self]. > > "e.g. Receiver Receiver > Selector/Arg0 => Arg1 > Arg1 Arg2 > Arg2 sp-> Arg3 > sp-> Arg3" > super adjustArgumentsForPerform: numArgs! > >

2 1

New Cog VMs available
by Eliot Miranda 24 Feb '16

24 Feb '16

...at http://www.mirandabanda.org/files/Cog/VM/VM.r3630 a.k.a. http://www.mirandabanda.org/files/Cog/VM/latest. Noe tat there is a JIT bug in the 64-bit VMs which I shall look at this week. CogVM binaries as per VMMaker.oscog-eem.1697/r3630 General: Fix serious bug in jitted perform: primitive. Thanks to Stephane Ducasse for finding and to Levente Uzoni for diagnosing the bug. If the argument count is one greater than the max number of register arguments (2 in Spur, hence perform:with:with:) then the code to remove the receiver and arguments from the stack neglects to remove the receiver and selector. Spur: Fix bug in markAndTraceWeaklingsFrom:. Fields of weaklings may be immediate so must use followOopField:ofObject: not followObjField:ofObject:. Fix https://pharo.fogbugz.com/f/cases/17536/VM-Crash-when-adding-an-iVar-to-a-s… . When weaklings (and when ephemerons) are scan-marked forwarders must be coped with. 64-bit VMs: Fix a bug in printHex: for 64-bits (faulty arithmetic). ThreadedFFIPlugin: Fix the remaining 64-bit issues in the ThreadedFFIPlugin. The X64SysVFFIPlugin now passes the test suite. Hence include the FFI plugin in 64-bit VMs. Mac VMs: Have the Mac OS X build install Localizable.strings. Add versions for Newspeak, Pharo and Squeak. Rename the key to SelectImagePanePrompt. Temporarily disable the Serial plugin in the Pharo Mac VM until we can track down the relevant platforms/iOS support for the Pharo extensions. Fix argument access on the iOS platform (Mac OS VMs). _,,,^..^,,,_ best, Eliot

1 0

[commit][3630] CogVM source as per VMMaker.oscog-eem.1697
by commits＠squeakvm.org 24 Feb '16

24 Feb '16

Revision: 3630 Author: eliot Date: 2016-02-23 17:02:35 -0800 (Tue, 23 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1697 Fix serious bug in jitted perform: primitive. Thanks to Stephane Ducasse for finding and to Levente Uzoni for diagnosing the bug. If the argument count is one greater than the max number of register arguments (2 in Spur, hence perform:with:with:) then the code to remove the receiver and arguments from the stack neglects to remove the receiver and selector. Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -3700,7 +3700,7 @@ closedPICRefersToUnmarkedObject(CogMethod *cPIC) { sqInt i; - sqInt object; + usqInt object; sqInt pc; if (!((isImmediate((cPIC->selector))) @@ -23578,10 +23578,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -23592,10 +23593,24 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; + sqInt literal; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -23607,28 +23622,33 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction7 = genoperandoperandoperand(MoveMwrR, 0, SPReg, TempReg); + /* begin MoveMw:r:R: */ + anInstruction4 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction5 = genoperandoperandoperand(MoveMwrR, BytesPerWord * 2, SPReg, Arg0Reg); - /* begin MoveMw:r:R: */ - anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg0Reg); + /* begin AddCq:R: */ + quickConstant1 = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction8 = genoperandoperand(AddCqR, quickConstant1, SPReg); /* begin MoveR:Mw:r: */ - anInstruction1 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + anInstruction9 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); return; } - for (index = (numArgs - 1); index >= 0; index += -1) { + for (index = (numArgs - 1); index >= 1; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + anInstruction13 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); /* begin MoveR:Mw:r: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); + anInstruction14 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); } /* begin PopR: */ genoperand(PopR, TempReg); /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + anInstruction15 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10558,12 +10558,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -24957,10 +24957,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -24971,11 +24972,25 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; sqInt offset; + sqInt offset1; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -24987,35 +25002,47 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg1Reg); + if (usesOutOfLineLiteral(anInstruction)) { + (anInstruction->dependent = locateLiteral(0)); + } + /* begin MoveMw:r:R: */ + anInstruction1 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg0Reg); + if (usesOutOfLineLiteral(anInstruction1)) { + (anInstruction1->dependent = locateLiteral(BytesPerWord)); + } - /* begin PopR: */ - genoperand(PopR, Arg0Reg); + /* begin AddCq:R: */ + quickConstant = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction3 = genoperandoperand(AddCqR, quickConstant, SPReg); + if (usesOutOfLineLiteral(anInstruction3)) { + (anInstruction3->dependent = locateLiteral(quickConstant)); + } return; } for (index = (numArgs - 2); index >= 0; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); - if (usesOutOfLineLiteral(anInstruction2)) { - (anInstruction2->dependent = locateLiteral(index * BytesPerWord)); + anInstruction10 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + if (usesOutOfLineLiteral(anInstruction10)) { + (anInstruction10->dependent = locateLiteral(index * BytesPerWord)); } /* begin MoveR:Mw:r: */ offset = (index + 1) * BytesPerWord; /* begin gen:operand:quickConstant:operand: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, offset, SPReg); - if (usesOutOfLineLiteral(anInstruction3)) { - (anInstruction3->dependent = locateLiteral(offset)); + anInstruction11 = genoperandoperandoperand(MoveRMwr, TempReg, offset, SPReg); + if (usesOutOfLineLiteral(anInstruction11)) { + (anInstruction11->dependent = locateLiteral(offset)); } } - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); - if (usesOutOfLineLiteral(anInstruction4)) { - (anInstruction4->dependent = locateLiteral(0)); + /* begin AddCq:R: */ + anInstruction12 = genoperandoperand(AddCqR, BytesPerWord, SPReg); + if (usesOutOfLineLiteral(anInstruction12)) { + (anInstruction12->dependent = locateLiteral(BytesPerWord)); } + } Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -22238,10 +22238,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -22252,10 +22253,24 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; + sqInt literal; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -22267,28 +22282,33 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction7 = genoperandoperandoperand(MoveMwrR, 0, SPReg, TempReg); + /* begin MoveMw:r:R: */ + anInstruction4 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction5 = genoperandoperandoperand(MoveMwrR, BytesPerWord * 2, SPReg, Arg0Reg); - /* begin MoveMw:r:R: */ - anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg0Reg); + /* begin AddCq:R: */ + quickConstant1 = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction8 = genoperandoperand(AddCqR, quickConstant1, SPReg); /* begin MoveR:Mw:r: */ - anInstruction1 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + anInstruction9 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); return; } - for (index = (numArgs - 1); index >= 0; index += -1) { + for (index = (numArgs - 1); index >= 1; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + anInstruction13 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); /* begin MoveR:Mw:r: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); + anInstruction14 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); } /* begin PopR: */ genoperand(PopR, TempReg); /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + anInstruction15 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + } Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5738,12 +5738,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -22456,10 +22456,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -22470,10 +22471,24 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; + sqInt literal; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -22485,24 +22500,28 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction1 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg0Reg); - /* begin PopR: */ - genoperand(PopR, Arg0Reg); + /* begin AddCq:R: */ + quickConstant = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction3 = genoperandoperand(AddCqR, quickConstant, SPReg); return; } for (index = (numArgs - 2); index >= 0; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + anInstruction10 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); /* begin MoveR:Mw:r: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); + anInstruction11 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); } - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + /* begin AddCq:R: */ + literal = BytesPerWord; + anInstruction12 = genoperandoperand(AddCqR, BytesPerWord, SPReg); + } Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Feb 23 11:46:01 PST 2016 + Tue Feb 23 17:00:43 PST 2016 Modified: branches/Cog/spur64src/vm/cogit.h =================================================================== --- branches/Cog/spur64src/vm/cogit.h 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/spur64src/vm/cogit.h 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ Modified: branches/Cog/spur64src/vm/cogitX64.c =================================================================== --- branches/Cog/spur64src/vm/cogitX64.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/spur64src/vm/cogitX64.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -21323,10 +21323,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -21337,10 +21338,24 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; + sqInt literal; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -21352,28 +21367,33 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction7 = genoperandoperandoperand(MoveMwrR, 0, SPReg, TempReg); + /* begin MoveMw:r:R: */ + anInstruction4 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction5 = genoperandoperandoperand(MoveMwrR, BytesPerWord * 2, SPReg, Arg0Reg); - /* begin MoveMw:r:R: */ - anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg0Reg); + /* begin AddCq:R: */ + quickConstant1 = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction8 = genoperandoperand(AddCqR, quickConstant1, SPReg); /* begin MoveR:Mw:r: */ - anInstruction1 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + anInstruction9 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); return; } - for (index = (numArgs - 1); index >= 0; index += -1) { + for (index = (numArgs - 1); index >= 1; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + anInstruction13 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); /* begin MoveR:Mw:r: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); + anInstruction14 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); } /* begin PopR: */ genoperand(PopR, TempReg); /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + anInstruction15 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + } Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/spursistasrc/vm/cogit.h 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitARMv5.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -26068,10 +26068,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -26082,11 +26083,25 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; sqInt offset; + sqInt offset1; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -26098,35 +26113,47 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg1Reg); + if (usesOutOfLineLiteral(anInstruction)) { + (anInstruction->dependent = locateLiteral(0)); + } + /* begin MoveMw:r:R: */ + anInstruction1 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg0Reg); + if (usesOutOfLineLiteral(anInstruction1)) { + (anInstruction1->dependent = locateLiteral(BytesPerWord)); + } - /* begin PopR: */ - genoperand(PopR, Arg0Reg); + /* begin AddCq:R: */ + quickConstant = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction3 = genoperandoperand(AddCqR, quickConstant, SPReg); + if (usesOutOfLineLiteral(anInstruction3)) { + (anInstruction3->dependent = locateLiteral(quickConstant)); + } return; } for (index = (numArgs - 2); index >= 0; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); - if (usesOutOfLineLiteral(anInstruction2)) { - (anInstruction2->dependent = locateLiteral(index * BytesPerWord)); + anInstruction10 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + if (usesOutOfLineLiteral(anInstruction10)) { + (anInstruction10->dependent = locateLiteral(index * BytesPerWord)); } /* begin MoveR:Mw:r: */ offset = (index + 1) * BytesPerWord; /* begin gen:operand:quickConstant:operand: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, offset, SPReg); - if (usesOutOfLineLiteral(anInstruction3)) { - (anInstruction3->dependent = locateLiteral(offset)); + anInstruction11 = genoperandoperandoperand(MoveRMwr, TempReg, offset, SPReg); + if (usesOutOfLineLiteral(anInstruction11)) { + (anInstruction11->dependent = locateLiteral(offset)); } } - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); - if (usesOutOfLineLiteral(anInstruction4)) { - (anInstruction4->dependent = locateLiteral(0)); + /* begin AddCq:R: */ + anInstruction12 = genoperandoperand(AddCqR, BytesPerWord, SPReg); + if (usesOutOfLineLiteral(anInstruction12)) { + (anInstruction12->dependent = locateLiteral(BytesPerWord)); } + } Modified: branches/Cog/spursistasrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitIA32.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/spursistasrc/vm/cogitIA32.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -23394,10 +23394,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -23408,10 +23409,24 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; + sqInt literal; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -23423,28 +23438,33 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction7 = genoperandoperandoperand(MoveMwrR, 0, SPReg, TempReg); + /* begin MoveMw:r:R: */ + anInstruction4 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction5 = genoperandoperandoperand(MoveMwrR, BytesPerWord * 2, SPReg, Arg0Reg); - /* begin MoveMw:r:R: */ - anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg0Reg); + /* begin AddCq:R: */ + quickConstant1 = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction8 = genoperandoperand(AddCqR, quickConstant1, SPReg); /* begin MoveR:Mw:r: */ - anInstruction1 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + anInstruction9 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); return; } - for (index = (numArgs - 1); index >= 0; index += -1) { + for (index = (numArgs - 1); index >= 1; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + anInstruction13 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); /* begin MoveR:Mw:r: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); + anInstruction14 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); } /* begin PopR: */ genoperand(PopR, TempReg); /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + anInstruction15 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + } Modified: branches/Cog/spursistasrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitMIPSEL.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/spursistasrc/vm/cogitMIPSEL.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -23611,10 +23611,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -23625,10 +23626,24 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; + sqInt literal; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -23640,24 +23655,28 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction1 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg0Reg); - /* begin PopR: */ - genoperand(PopR, Arg0Reg); + /* begin AddCq:R: */ + quickConstant = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction3 = genoperandoperand(AddCqR, quickConstant, SPReg); return; } for (index = (numArgs - 2); index >= 0; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + anInstruction10 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); /* begin MoveR:Mw:r: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); + anInstruction11 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); } - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + /* begin AddCq:R: */ + literal = BytesPerWord; + anInstruction12 = genoperandoperand(AddCqR, BytesPerWord, SPReg); + } Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/spursrc/vm/cogit.h 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ Modified: branches/Cog/spursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursrc/vm/cogitARMv5.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/spursrc/vm/cogitARMv5.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -22554,10 +22554,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -22568,11 +22569,25 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; sqInt offset; + sqInt offset1; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -22584,35 +22599,47 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg1Reg); + if (usesOutOfLineLiteral(anInstruction)) { + (anInstruction->dependent = locateLiteral(0)); + } + /* begin MoveMw:r:R: */ + anInstruction1 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg0Reg); + if (usesOutOfLineLiteral(anInstruction1)) { + (anInstruction1->dependent = locateLiteral(BytesPerWord)); + } - /* begin PopR: */ - genoperand(PopR, Arg0Reg); + /* begin AddCq:R: */ + quickConstant = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction3 = genoperandoperand(AddCqR, quickConstant, SPReg); + if (usesOutOfLineLiteral(anInstruction3)) { + (anInstruction3->dependent = locateLiteral(quickConstant)); + } return; } for (index = (numArgs - 2); index >= 0; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); - if (usesOutOfLineLiteral(anInstruction2)) { - (anInstruction2->dependent = locateLiteral(index * BytesPerWord)); + anInstruction10 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + if (usesOutOfLineLiteral(anInstruction10)) { + (anInstruction10->dependent = locateLiteral(index * BytesPerWord)); } /* begin MoveR:Mw:r: */ offset = (index + 1) * BytesPerWord; /* begin gen:operand:quickConstant:operand: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, offset, SPReg); - if (usesOutOfLineLiteral(anInstruction3)) { - (anInstruction3->dependent = locateLiteral(offset)); + anInstruction11 = genoperandoperandoperand(MoveRMwr, TempReg, offset, SPReg); + if (usesOutOfLineLiteral(anInstruction11)) { + (anInstruction11->dependent = locateLiteral(offset)); } } - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); - if (usesOutOfLineLiteral(anInstruction4)) { - (anInstruction4->dependent = locateLiteral(0)); + /* begin AddCq:R: */ + anInstruction12 = genoperandoperand(AddCqR, BytesPerWord, SPReg); + if (usesOutOfLineLiteral(anInstruction12)) { + (anInstruction12->dependent = locateLiteral(BytesPerWord)); } + } Modified: branches/Cog/spursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursrc/vm/cogitIA32.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/spursrc/vm/cogitIA32.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -19960,10 +19960,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -19974,10 +19975,24 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; + sqInt literal; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -19989,28 +20004,33 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction7 = genoperandoperandoperand(MoveMwrR, 0, SPReg, TempReg); + /* begin MoveMw:r:R: */ + anInstruction4 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction5 = genoperandoperandoperand(MoveMwrR, BytesPerWord * 2, SPReg, Arg0Reg); - /* begin MoveMw:r:R: */ - anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg0Reg); + /* begin AddCq:R: */ + quickConstant1 = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction8 = genoperandoperand(AddCqR, quickConstant1, SPReg); /* begin MoveR:Mw:r: */ - anInstruction1 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + anInstruction9 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); return; } - for (index = (numArgs - 1); index >= 0; index += -1) { + for (index = (numArgs - 1); index >= 1; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + anInstruction13 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); /* begin MoveR:Mw:r: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); + anInstruction14 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); } /* begin PopR: */ genoperand(PopR, TempReg); /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + anInstruction15 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + } Modified: branches/Cog/spursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/spursrc/vm/cogitMIPSEL.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/spursrc/vm/cogitMIPSEL.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5280,12 +5280,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -20168,10 +20168,11 @@ } -/* e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc +/* e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 sp-> retpc */ /* Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive. */ @@ -20182,10 +20183,24 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction10; + AbstractInstruction *anInstruction11; + AbstractInstruction *anInstruction12; + AbstractInstruction *anInstruction13; + AbstractInstruction *anInstruction14; + AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; + AbstractInstruction *anInstruction5; + AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; + AbstractInstruction *anInstruction8; + AbstractInstruction *anInstruction9; sqInt index; + sqInt literal; + sqInt quickConstant; + sqInt quickConstant1; assert((numRegArgs()) <= 2); assert(numArgs >= 1); @@ -20197,24 +20212,28 @@ return; } if ((2 + 1) == numArgs) { - /* begin PopR: */ - genoperand(PopR, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction = genoperandoperandoperand(MoveMwrR, 0, SPReg, Arg1Reg); + /* begin MoveMw:r:R: */ + anInstruction1 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, Arg0Reg); - /* begin PopR: */ - genoperand(PopR, Arg0Reg); + /* begin AddCq:R: */ + quickConstant = (numArgs + 1) * BytesPerWord; + /* begin gen:quickConstant:operand: */ + anInstruction3 = genoperandoperand(AddCqR, quickConstant, SPReg); return; } for (index = (numArgs - 2); index >= 0; index += -1) { /* begin MoveMw:r:R: */ - anInstruction2 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + anInstruction10 = genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); /* begin MoveR:Mw:r: */ - anInstruction3 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); + anInstruction11 = genoperandoperandoperand(MoveRMwr, TempReg, (index + 1) * BytesPerWord, SPReg); } - /* begin PopR: */ - genoperand(PopR, TempReg); - /* begin MoveR:Mw:r: */ - anInstruction4 = genoperandoperandoperand(MoveRMwr, TempReg, 0, SPReg); + /* begin AddCq:R: */ + literal = BytesPerWord; + anInstruction12 = genoperandoperand(AddCqR, BytesPerWord, SPReg); + } Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/src/vm/cogit.h 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ Modified: branches/Cog/src/vm/cogitARMv5.c =================================================================== --- branches/Cog/src/vm/cogitARMv5.c 2016-02-23 19:46:31 UTC (rev 3629) +++ branches/Cog/src/vm/cogitARMv5.c 2016-02-24 01:02:35 UTC (rev 3630) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; @@ Diff output truncated at 50000 characters. @@

1 0

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 February 2016