Vm-dev May 2014

vm-dev@lists.squeakfoundation.org

32 participants
151 discussions

VM Maker: VMMaker.oscog-tpr.736.mcz
by commits＠source.squeak.org 29 May '14

29 May '14

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.736.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.736 Author: tpr Time: 28 May 2014, 9:47:52.06 am UUID: 52dd5233-dcb9-46a7-80ce-d69b874aa615 Ancestors: VMMaker.oscog-eem.735 Merge with -eem.735 Add CogARMCompiler code to make ARM opcodes a bit easier to write (add:rn:, mov:rn: etc) Change the return to use LR instead of popping the return address from the stack - lots of side effects to fix up =============== Diff against VMMaker.oscog-eem.735 =============== Item was added: + ----- Method: CogARMCompiler>>add:rn:rm: (in category 'ARM convenience instructions') ----- + add: destReg rn: srcReg rm: addReg + "return an ADD destReg, srcReg, addReg instruction" + + ^self type: 0 op: 4 set: 0 rn: srcReg rd: destReg shifterOperand: addReg! Item was removed: - ----- Method: CogARMCompiler>>addRd:rn:imm:ror: (in category 'ARM convenience instructions') ----- - addRd: destReg rn: srcReg imm: immediate ror: rot - "return an ADD destReg, srcReg, immediat ROR rot instruction" - - ^self type: 1 op: 4 set: 0 rn: srcReg rd: destReg shifterOperand: (rot <<8 bitOr: immediate)! Item was removed: - ----- Method: CogARMCompiler>>addRd:rn:rm: (in category 'ARM convenience instructions') ----- - addRd: destReg rn: srcReg rm: addReg - "return an ADD destReg, srcReg, addReg instruction" - - ^self type: 0 op: 4 set: 0 rn: srcReg rd: destReg shifterOperand: addReg! Item was removed: - ----- Method: CogARMCompiler>>callsAreRelative (in category 'testing') ----- - callsAreRelative - ^true! Item was changed: ----- Method: CogARMCompiler>>concretizeLoadEffectiveAddressMwrR (in category 'generate machine code - concretize') ----- concretizeLoadEffectiveAddressMwrR "Will get inlined into concretizeAt: switch." "destReg = srcReg (which contains an address) + offset" <inline: true> | srcReg offset destReg instrOffset | offset := operands at: 0. srcReg := self concreteRegister: (operands at: 1). destReg := self concreteRegister: (operands at: 2). self rotateable8bitImmediate: offset ifTrue: [ :rot :immediate | self machineCodeAt: 0 "add destReg, srcReg, #immediate ROR rot" put: (self add: destReg rn: srcReg imm: immediate ror: rot). ^machineCodeSize := 4] ifFalse: [ instrOffset := self at: 0 moveCw: offset intoR: RISCTempReg. "add destReg, srcReg, RISCTempReg" + self machineCodeAt: 16 put: (self add: destReg rn: srcReg rm: RISCTempReg). - self machineCodeAt: 16 put: (self addRd: destReg rn: srcReg rm: RISCTempReg). ^machineCodeSize := instrOffset + 4 ]! Item was changed: ----- Method: CogARMCompiler>>concretizePopR (in category 'generate machine code - concretize') ----- concretizePopR "Will get inlined into concretizeAt: switch." <inline: true> | destReg | destReg := self concreteRegister: (operands at: 0). + "LDR destReg, [SP], #4" - "cond | 010 | 0100 | 1 | -Rn- | -Rd- | 0000 0000 0100 " "LDR destReg, [SP], #4" self machineCodeAt: 0 put: (self popR: destReg). ^machineCodeSize := 4! Item was changed: ----- Method: CogARMCompiler>>concretizePushR (in category 'generate machine code - concretize') ----- concretizePushR "Will get inlined into concretizeAt: switch." <inline: true> | srcReg | srcReg := self concreteRegister: (operands at: 0). "cond | 010 | 1001 | 0 | -Rn- | -Rd- | 0000 0000 0100" "STR srcReg, [sp, #-4]" + self machineCodeAt: 0 put: (self pushR: srcReg). - self machineCodeAt: 0 put: (self type: 2 op: 9 set: 0 rn: SP rd: srcReg shifterOperand: 4). ^machineCodeSize := 4! Item was changed: ----- Method: CogARMCompiler>>concretizeRetN (in category 'generate machine code - concretize') ----- concretizeRetN "Will get inlined into concretizeAt: switch." <inline: true> | offset | offset := operands at: 0. offset = 0 ifTrue: + [self machineCodeAt: 0 put: (self mov: PC rn: LR). "pop {pc}" - [self machineCodeAt: 0 put: (self popR: PC). "pop {pc}" ^machineCodeSize := 4]. self assert: offset < 32. "We have an 8 bit immediate. If needed, we could rotate it less than 30 bit." "add sp, sp, #n, ROR (15<<2) <- ie shift left 2 to convert words to bytes" self machineCodeAt: 0 put: (self add: SP rn: SP imm: offset ror: 30). + self machineCodeAt: 4 put: (self mov: PC rn: LR). "pop {pc}" - self machineCodeAt: 4 put: (self popR: PC). "pop {pc}" ^machineCodeSize := 8! Item was added: + ----- Method: CogARMCompiler>>mov:rn: (in category 'ARM convenience instructions') ----- + mov: destReg rn: srcReg + "return a MOV destReg, srcReg instruction" + + ^self type: 0 op: 16rD set: 0 rn: 0 rd: destReg shifterOperand: srcReg! Item was removed: - ----- Method: CogARMCompiler>>movRd:imm:ror: (in category 'ARM convenience instructions') ----- - movRd: destReg imm: immediate8bitValue ror: rotateRightBy - "return the ARM instruction MOV destReg, #immediate8BitValue ROR rotateRightBy" - ^self type: 1 op: 16rD set: 0 rn: destReg rd: destReg shifterOperand: (rotateRightBy <<8 bitOr: immediate8bitValue)! Item was added: + ----- Method: CogARMCompiler>>movs:rn: (in category 'ARM convenience instructions') ----- + movs: destReg rn: srcReg + "return a MOV destReg, srcReg instruction" + + ^self type: 0 op: 16rD set: 1 rn: 0 rd: destReg shifterOperand: srcReg! Item was removed: - ----- Method: CogARMCompiler>>orrRd:imm:ror: (in category 'ARM convenience instructions') ----- - orrRd: destReg imm: immediate8bitValue ror: rotateRightBy - "return the ARM instruction ORR destReg, #immediate8BitValue ROR rotateRightBy" - ^self type: 1 op: 16rB set: 0 rn: destReg rd: destReg shifterOperand: (rotateRightBy <<8 bitOr: immediate8bitValue)! Item was added: + ----- Method: CogARMCompiler>>setsConditionCodesFor: (in category 'testing') ----- + setsConditionCodesFor: aConditionalJumpOpcode + <inline: false> "to save Slang from having to be a real compiler (it can't inline switches that return)" + "Answer if the receiver's opcode sets the condition codes correctly for the given conditional jump opcode. + ARM has to check carefully since the V flag is not affected by non-comparison instructions" + ^opcode caseOf: + { [ArithmeticShiftRightCqR] -> [self shiftSetsConditionCodesFor: aConditionalJumpOpcode]. + [ArithmeticShiftRightRR] -> [self shiftSetsConditionCodesFor: aConditionalJumpOpcode]. + [LogicalShiftLeftCqR] -> [self shiftSetsConditionCodesFor: aConditionalJumpOpcode]. + [LogicalShiftLeftRR] -> [self shiftSetsConditionCodesFor: aConditionalJumpOpcode]. + [XorRR] -> [true] + } + otherwise: [self halt: 'unhandled opcode in setsConditionCodesFor:'. false]! Item was added: + ----- Method: CogARMCompiler>>shiftSetsConditionCodesFor: (in category 'testing') ----- + shiftSetsConditionCodesFor: aConditionalJumpOpcode + "check what flags the opcdoe needs setting - ARM doesn't set V when simply MOVing" + ^aConditionalJumpOpcode caseOf: + { [JumpNegative] -> [true]. + [JumpZero] -> [true]. + } + otherwise: [self halt: 'unhandled opcode in setsConditionCodesFor:'. false]! Item was changed: ----- Method: Cogit>>genCheckForInterruptsTrampoline (in category 'initialization') ----- genCheckForInterruptsTrampoline opcodeIndex := 0. backEnd hasLinkRegister ifTrue: [self MoveR: LinkReg Aw: coInterpreter instructionPointerAddress] ifFalse: [self PopR: TempReg. "instruction pointer" self MoveR: TempReg Aw: coInterpreter instructionPointerAddress]. ^self genTrampolineFor: #ceCheckForInterrupts called: 'ceCheckForInterruptsTrampoline' callJumpBar: true numArgs: 0 arg: nil arg: nil arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true! Item was changed: ----- Method: Cogit>>genEnilopmartFor:and:and:called: (in category 'initialization') ----- genEnilopmartFor: regArg1 and: regArg2 and: regArg3 called: trampolineName "An enilopmart (the reverse of a trampoline) is a piece of code that makes the system-call-like transition from the C runtime into generated machine code. The desired arguments and entry-point are pushed on a stackPage's stack. The enilopmart pops off the values to be loaded into registers and then executes a return instruction to pop off the entry-point and jump to it." <returnTypeC: 'void (*genEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, char *trampolineName))(void)'> | size endAddress enilopmart | opcodeIndex := 0. backEnd genLoadStackPointers. self PopR: regArg3. self PopR: regArg2. self PopR: regArg1. backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. self RetN: 0. self computeMaximumSizes. size := self generateInstructionsAt: methodZoneBase. endAddress := self outputInstructionsAt: methodZoneBase. self assert: methodZoneBase + size = endAddress. enilopmart := methodZoneBase. methodZoneBase := self alignUptoRoutineBoundary: endAddress. backEnd nopsFrom: endAddress to: methodZoneBase - 1. self recordGeneratedRunTime: trampolineName address: enilopmart. ^self cCoerceSimple: enilopmart to: #'void (*)(void)'! Item was changed: ----- Method: Cogit>>genEnilopmartFor:and:called: (in category 'initialization') ----- genEnilopmartFor: regArg1 and: regArg2 called: trampolineName "An enilopmart (the reverse of a trampoline) is a piece of code that makes the system-call-like transition from the C runtime into generated machine code. The desired arguments and entry-point are pushed on a stackPage's stack. The enilopmart pops off the values to be loaded into registers and then executes a return instruction to pop off the entry-point and jump to it." <returnTypeC: 'void (*genEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)'> | size endAddress enilopmart | opcodeIndex := 0. backEnd genLoadStackPointers. self PopR: regArg2. self PopR: regArg1. backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. self RetN: 0. self computeMaximumSizes. size := self generateInstructionsAt: methodZoneBase. endAddress := self outputInstructionsAt: methodZoneBase. self assert: methodZoneBase + size = endAddress. enilopmart := methodZoneBase. methodZoneBase := self alignUptoRoutineBoundary: endAddress. backEnd nopsFrom: endAddress to: methodZoneBase - 1. self recordGeneratedRunTime: trampolineName address: enilopmart. ^self cCoerceSimple: enilopmart to: #'void (*)(void)'! Item was changed: ----- Method: Cogit>>genEnilopmartFor:called: (in category 'initialization') ----- genEnilopmartFor: regArg called: trampolineName "An enilopmart (the reverse of a trampoline) is a piece of code that makes the system-call-like transition from the C runtime into generated machine code. The desired arguments and entry-point are pushed on a stackPage's stack. The enilopmart pops off the values to be loaded into registers and then executes a return instruction to pop off the entry-point and jump to it." <returnTypeC: 'void (*genEnilopmartForcalled(sqInt regArg, char *trampolineName))(void)'> | size endAddress enilopmart | opcodeIndex := 0. backEnd genLoadStackPointers. self PopR: regArg. backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. self RetN: 0. self computeMaximumSizes. size := self generateInstructionsAt: methodZoneBase. endAddress := self outputInstructionsAt: methodZoneBase. self assert: methodZoneBase + size = endAddress. enilopmart := methodZoneBase. methodZoneBase := self alignUptoRoutineBoundary: endAddress. backEnd nopsFrom: endAddress to: methodZoneBase - 1. self recordGeneratedRunTime: trampolineName address: enilopmart. ^self cCoerceSimple: enilopmart to: #'void (*)(void)'! Item was changed: ----- Method: Cogit>>genExternalizePointersForPrimitiveCall (in category 'trampoline support') ----- genExternalizePointersForPrimitiveCall backEnd hasLinkRegister ifTrue: [self PushR: LinkReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. self MoveR: FPReg Aw: coInterpreter framePointerAddress. "Set coInterpreter stackPointer to the topmost argument, skipping the return address." self LoadEffectiveAddressMw: BytesPerWord r: SPReg R: TempReg. backEnd hasLinkRegister ifTrue: [self MoveR: LinkReg Aw: coInterpreter instructionPointerAddress] ifFalse: [self MoveR: ClassReg Aw: coInterpreter instructionPointerAddress]. self MoveR: TempReg Aw: coInterpreter stackPointerAddress. ^0! Item was changed: ----- Method: Cogit>>genNonLocalReturnTrampoline (in category 'initialization') ----- genNonLocalReturnTrampoline opcodeIndex := 0. backEnd hasLinkRegister ifTrue: [self MoveR: LinkReg Aw: coInterpreter instructionPointerAddress] ifFalse: [self PopR: TempReg. "instruction pointer" self MoveR: TempReg Aw: coInterpreter instructionPointerAddress]. ^self genTrampolineFor: #ceNonLocalReturn: called: 'ceNonLocalReturnTrampoline' callJumpBar: true numArgs: 1 arg: ReceiverResultReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true! Item was changed: ----- Method: SimpleStackBasedCogit>>genReturnTopFromBlock (in category 'bytecode generators') ----- genReturnTopFromBlock self assert: inBlock. self flag: 'currently caller pushes result'. self PopR: ReceiverResultReg. needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg]. backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. self RetN: methodOrBlockNumArgs + 1 * BytesPerWord. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genUpArrowReturn (in category 'bytecode generators') ----- genUpArrowReturn "Generate a method return from within a method or a block. Frameless method activation looks like receiver args sp-> ret pc. Return pops receiver and arguments off the stack. Callee pushes the result." self flag: 'currently caller pushes result'. inBlock ifTrue: [self assert: needsFrame. self annotateBytecode: (self CallRT: ceNonLocalReturnTrampoline). ^0]. needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg]. backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. self RetN: methodOrBlockNumArgs + 1 * BytesPerWord. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genMethodAbortTrampolineFor: (in category 'initialization') ----- genMethodAbortTrampolineFor: numArgs + "Generate the abort for a method. This abort performs either a call of ceSICMiss: to handle a single-in-line cache miss or a call of ceStackOverflow: to handle a stack overflow. It distinguishes the two by testing ResultReceiverReg. If the register is zero then this is a stack-overflow because a) the receiver has already been pushed and so can be set to zero before calling the abort, and b) the receiver must always contain an object (and hence be non-zero) on SIC miss." | jumpSICMiss | <var: #jumpSICMiss type: #'AbstractInstruction *'> opcodeIndex := 0. self CmpCq: 0 R: ReceiverResultReg. jumpSICMiss := self JumpNonZero: 0. "on machines with a link register, pop the stack if the ReceiverResultReg = 0, i.e. if coming through the stack check abort; frame build has already pushed it." backEnd hasLinkRegister ifTrue: [self AddCq: BytesPerWord R: SPReg]. self compileTrampolineFor: #ceStackOverflow: callJumpBar: true numArgs: 1 arg: SendNumArgsReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil. jumpSICMiss jmpTarget: self Label. backEnd genPushRegisterArgsForAbortMissNumArgs: numArgs. ^self genTrampolineFor: #ceSICMiss: called: (self trampolineName: 'ceMethodAbort' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1])) callJumpBar: true numArgs: 1 arg: ReceiverResultReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true! Item was changed: ----- Method: StackToRegisterMappingCogit>>genReturnTopFromBlock (in category 'bytecode generators') ----- genReturnTopFromBlock self assert: inBlock. self ssTop popToReg: ReceiverResultReg. self ssPop: 1. needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg]. backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. self RetN: methodOrBlockNumArgs + 1 * BytesPerWord. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genUpArrowReturn (in category 'bytecode generators') ----- genUpArrowReturn "Generate a method return from within a method or a block. Frameless method activation looks like receiver args sp-> ret pc. Return pops receiver and arguments off the stack. Callee pushes the result." inBlock ifTrue: [self assert: needsFrame. self annotateBytecode: (self CallRT: ceNonLocalReturnTrampoline). ^0]. needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg. backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. self RetN: methodOrBlockNumArgs + 1 * BytesPerWord] ifFalse: [backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. self RetN: ((methodOrBlockNumArgs > self numRegArgs "A method with an interpreter prim will push its register args for the prim. If the failure body is frameless the args must still be popped, see e.g. Behavior>>nextInstance." or: [regArgsHaveBeenPushed]) ifTrue: [methodOrBlockNumArgs + 1 * BytesPerWord] ifFalse: [0])]. ^0!

1 0

VM Maker: Cog-tpr.154.mcz
by commits＠source.squeak.org 29 May '14

29 May '14

tim Rowledge uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-tpr.154.mcz ==================== Summary ==================== Name: Cog-tpr.154 Author: tpr Time: 28 May 2014, 9:40:57.428 am UUID: 2ffcde09-dbe5-4fef-b323-817470a605c2 Ancestors: Cog-tpr.153 Add some return trapping tests in GdbARMAlianTests Improve return failure handling in GdbARMAlien =============== Diff against Cog-tpr.153 =============== Item was changed: ----- Method: CogProcessorAlien>>disassembleNextInstructionIn:for: (in category 'disassembly') ----- disassembleNextInstructionIn: memory for: aSymbolManager "<Cogit|nil>" | string | string := self pc < memory size ifTrue: [(self primitiveDisassembleAt: self pc inMemory: memory) last.] + ifFalse: [^self pc hex, ' : Invalid address']. - ifFalse: [^{'Invalid address ' . self pc. ')'}]. ^aSymbolManager ifNil: [string] ifNotNil: [self decorateDisassembly: string for: aSymbolManager]! Item was changed: ----- Method: GdbARMAlien>>handleExecutionPrimitiveFailureIn:minimumAddress: (in category 'error handling') ----- handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" "Handle an execution primitive failure. Convert out-of-range call and absolute memory read into register instructions into ProcessorSimulationTrap signals." "self printRegistersOn: Transcript" | pc | self endCondition = 5 ifTrue:[self pc: self priorPc]. ((pc := self pc) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: [(self instructionTypeAt: pc in: memoryArray) caseOf: { [#Call] -> [^self handleCallFailureAt: pc in: memoryArray]. [#LongCall] -> [^self handleLongCallFailureAt: pc in: memoryArray]. [#Jump] -> [^self handleJmpFailureAt: pc in: memoryArray]. [#LongJump] -> [^self handleLongJmpFailureAt: pc in: memoryArray]. [#MoveAwR] -> [^self handleMoveAwRFailureAt: pc in: memoryArray]. [#MoveMbrR] -> [^self handleMoveMbrRFailureAt: pc in: memoryArray]. [#MoveRAw] -> [^self handleMoveRAwFailureAt: pc in: memoryArray]. [#MoveRMbr] -> [^self handleMoveRMbrFailureAt: pc in: memoryArray]. [#Ret] -> [^self handleRetFailureAt: pc in: memoryArray].} otherwise: [^self handleExecutionPrimitiveFailureAt: pc in: memoryArray]]. + + pc = 0 ifTrue:[self halt: 'pc should not be 0 at this point; simulator failure']. + ((pc := self lr - 4) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: [(self instructionTypeAt: pc in: memoryArray) caseOf: { [#Call] -> [^self handleCallFailureAt: pc in: memoryArray]. [#LongCall] -> [^self handleLongCallFailureAt: pc in: memoryArray]. [#Jump] -> [^self handleJmpFailureAt: pc in: memoryArray]. [#LongJump] -> [^self handleLongJmpFailureAt: pc in: memoryArray]. [#Ret] -> [^self handleRetFailureAt: pc in: memoryArray].} otherwise: [^self handleExecutionPrimitiveFailureAt: pc in: memoryArray]]. ^self reportPrimitiveFailure! Item was changed: ----- Method: GdbARMAlien>>handleRetFailureAt:in: (in category 'error handling') ----- handleRetFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a ret into a ProcessorSimulationTrap signal." self halt. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 + address: (memoryArray unsignedLongAt: self sp -3) - address: (memoryArray unsignedLongAt: self sp + 1) type: #return accessor: #pc:) signal! Item was added: + ----- Method: GdbARMAlien>>instructionIsReturnViaLR: (in category 'testing') ----- + instructionIsReturnViaLR: instr + "is this a MOV pc, lr instruction?" + ^instr = 16rE1A0F00E! Item was changed: ----- Method: GdbARMAlien>>instructionTypeAt:in: (in category 'error handling') ----- instructionTypeAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Identify which type of instruction is at pc in memoryArray. For the time being, only those instructions needed for PrimitiveFailure are identified." | RISCTempReg lastInstruction typeOperandStatus | RISCTempReg := CogARMCompiler ARMTempReg. lastInstruction := memoryArray unsignedLongAt: pc + 1 bigEndian: false . "self disassembleFrom: pc - 16 to: pc + 11 in: memoryArray on: Transcript cr" "Ret" + (self instructionIsReturnViaLR: lastInstruction ) ifTrue: [^#Ret]. - lastInstruction = self popPcOpcode ifTrue: [#Ret]. "Call" (self instructionIsBL: lastInstruction) ifTrue: [^#Call]. "long call" (self instructionIsBLX: lastInstruction) ifTrue: [^#LongCall]. "Jump" (self instructionIsB: lastInstruction) ifTrue: [^#Jump]. "long Jump" (self instructionIsBX: lastInstruction) ifTrue: [^#LongJump]. typeOperandStatus := lastInstruction >> 20 bitAnd: 16rFF. "MoveRMbr" (self instructionIsSTRB: lastInstruction) ifTrue: [^#MoveRMbr]. "MoveRAw" (self instructionIsSTR: lastInstruction byReg: RISCTempReg) ifTrue: [^#MoveRAw]. "MoveMbrR" (self instructionIsLDRB: lastInstruction) ifTrue: [^#MoveMbrR]. "MoveAwR" (self instructionIsLDR: lastInstruction byReg: RISCTempReg) ifTrue: [^#MoveAwR]. ^#UnidentifiedInstruction! Item was added: + ----- Method: GdbARMAlienTests>>testReturnTrap (in category 'tests') ----- + testReturnTrap + "return above-range." + + "self new testReturnTrap" + | memory | + memory := self memory. + self processor reset. + + "assemble a nasty number in r10" + memory unsignedLongAt: 5 put: (CogARMCompiler new mov: 10 imm: 16r1E ror: 8) bigEndian: false. + memory unsignedLongAt: 9 put: (CogARMCompiler new orr: 10 imm: 0 ror: 0) bigEndian: false. + memory unsignedLongAt: 13 put: (CogARMCompiler new orr: 10 imm: 0 ror: 0) bigEndian: false. + memory unsignedLongAt: 17 put: (CogARMCompiler new orr: 10 imm: 1 ror: 0) bigEndian: false. + "push this on the stack" + memory unsignedLongAt: 21 put: (CogARMCompiler new pushR: 10) bigEndian: false. + "pop the stack into pc to emulate a return via stack as generated in various trampoline code" + memory unsignedLongAt: 25 put: (CogARMCompiler new popR: 15) bigEndian: false. + + + "processor disassembleFrom: 0 to: 60 in: memory on: Transcript cr" + self processor + pc: 4; + sp: (memory size - 4); "Room for return address" + singleStepIn: memory readExecuteOnlyBelow: memory size /2 . + "We have to step several times, because the first step only changes the pc, but does not fetch anything from the address it points to." + self should: [self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2] + raise: ProcessorSimulationTrap + withExceptionDo: + [:pst| + self assert: self processor pc = 16r18. + self assert: pst pc = 16r18. + self assert: pst nextpc = 16r1C. + self assert: pst address = 16r1E000000. + self assert: pst type = #return].! Item was added: + ----- Method: GdbARMAlienTests>>testReturnTrap2 (in category 'tests') ----- + testReturnTrap2 + "return above-range." + + "self new testReturnTrap2" + | memory | + memory := self memory. + self processor reset. + + "assemble a nasty number in r10" + memory unsignedLongAt: 5 put: (CogARMCompiler new mov: 10 imm: 16r1E ror: 8) bigEndian: false. + memory unsignedLongAt: 9 put: (CogARMCompiler new orr: 10 imm: 0 ror: 0) bigEndian: false. + memory unsignedLongAt: 13 put: (CogARMCompiler new orr: 10 imm: 0 ror: 0) bigEndian: false. + memory unsignedLongAt: 17 put: (CogARMCompiler new orr: 10 imm: 0 ror: 0) bigEndian: false. + "push this on the stack" + memory unsignedLongAt: 21 put: (CogARMCompiler new pushR: 10) bigEndian: false. + "pop the stack into pc to emulate a return via stack as generated in various trampoline code" + memory unsignedLongAt: 25 put: (CogARMCompiler new popR: 15) bigEndian: false. + + + "processor disassembleFrom: 0 to: 60 in: memory on: Transcript cr" + self processor + pc: 4; + sp: (memory size - 4); "Room for return address" + singleStepIn: memory readExecuteOnlyBelow: memory size /2 . + "We have to step several times, because the first step only changes the pc, but does not fetch anything from the address it points to." + self should: [self processor runInMemory: memory readExecuteOnlyBelow: memory size /2.] + raise: ProcessorSimulationTrap + withExceptionDo: + [:pst| + self assert: self processor pc = 16r18. + self assert: pst pc = 16r18. + self assert: pst nextpc = 16r1C. + self assert: pst address = 16r1E000000. + self assert: pst type = #return].! Item was added: + ----- Method: GdbARMAlienTests>>testReturnTrapWithThumbBug (in category 'tests') ----- + testReturnTrapWithThumbBug + "return above-range with a bad address that ends in 1 - which triggers an ARM sim bug" + + "self new testReturnTrapWithThumbBug" + | memory | + memory := self memory. + self processor reset. + + "pop the stack into pc to emulate a return via stack as generated in various trampoline code" + memory unsignedLongAt: 1 put: (CogARMCompiler new mov: 15 rn: 14) bigEndian: false. + + + "processor disassembleFrom: 0 to: 60 in: memory on: Transcript cr" + self processor + pc: 0; + sp: (memory size - 4); "Room for return address" + pushWord:16r1E000001 in: memory; + singleStepIn: memory readExecuteOnlyBelow: memory size /2 . + "We have to step several times, because the first step only changes the pc, but does not fetch anything from the address it points to." + self should: [self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2. + self processor singleStepIn: memory readExecuteOnlyBelow: memory size /2] + raise: ProcessorSimulationTrap + withExceptionDo: + [:pst| + self assert: self processor pc = 16r18. + self assert: pst pc = 16r18. + self assert: pst nextpc = 16r1C. + self assert: pst address = 16r1E000000. + self assert: pst type = #return].!

1 0

[commit][2933] CogVM source as per VMMaker.oscog-eem.735
by commits＠squeakvm.org 29 May '14

29 May '14

Revision: 2933 Author: eliot Date: 2014-05-28 18:02:01 -0700 (Wed, 28 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.735 Spur: Fix management of lastFreeChunk during compaction (in sweepToCoallesceFreeSpaceForPigCompactFrom: and freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact). lastFreeChunk's link was not being correctly terminated. Add asserts to chunk freers to check for free chunks overlapping, which caught the compaction bug. Make sure that endOfMemory is immediately below the last bridge. This is where it was set when adding a new segment, but on loading a snapshot it was mispositioned at the end of the last bridge. Add a check to checkSegments, and use it in a few more places. Eliminate bogus assert in sortedFreeListPairwiseReverseDo:. If free gets used then lastFreeChunk won't point to it any more. Nuke obsolete method (from old non-repeating compact). Cogit: Correct link register usage in various places. e.g. enilopmarts, checkForInterrupts trampoline. But especially, correct link register usage in the return sequence generators. Since Tim and I agree that RetN: returns to the LinkReg, and no longer pops the return address from the stack, genUpArrowReturn and genReturnTopFromBlock must explicitly pop the saved return address into LinkReg before RetN:. That means that all the RetN:'s in machine code primitives will do the right thing, allowing these to avoid pushing LinkReg on entry. Frame print: fix a typo. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-05-28 15:19:56 UTC (rev 2932) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-05-29 01:02:01 UTC (rev 2933) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa + CCodeGenerator VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 from - StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa + StackToRegisterMappingCogit VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -7780,6 +7780,7 @@ AbstractInstruction *jumpTarget1114; AbstractInstruction *jumpTarget1115; AbstractInstruction *jumpTarget1116; + AbstractInstruction *jumpTarget1117; AbstractInstruction *jumpTarget112; AbstractInstruction *jumpTarget113; AbstractInstruction *jumpTarget114; @@ -7796,7 +7797,6 @@ AbstractInstruction *jumpTarget124; AbstractInstruction *jumpTarget125; AbstractInstruction *jumpTarget126; - AbstractInstruction *jumpTarget127; AbstractInstruction *jumpTarget13; AbstractInstruction *jumpTarget14; AbstractInstruction *jumpTarget15; @@ -8333,12 +8333,12 @@ } assert(jumpTarget13 != 0); jumpTarget4 = jumpTarget13; - offset17 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset16 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset17) + ? isQuick(self_in_dispatchConcretize, offset16) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 4); - ((self_in_dispatchConcretize->machineCode))[1] = (offset17 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset16 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -8352,13 +8352,13 @@ } assert(jumpTarget111 != 0); jumpTarget21 = jumpTarget111; - offset16 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset17 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 4); - ((self_in_dispatchConcretize->machineCode))[2] = (offset16 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset16) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset16) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset16) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[2] = (offset17 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset17) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 24) & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 6); return; @@ -8374,12 +8374,12 @@ } assert(jumpTarget14 != 0); jumpTarget5 = jumpTarget14; - offset19 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset18 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset19) + ? isQuick(self_in_dispatchConcretize, offset18) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 5); - ((self_in_dispatchConcretize->machineCode))[1] = (offset19 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset18 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -8393,13 +8393,13 @@ } assert(jumpTarget112 != 0); jumpTarget22 = jumpTarget112; - offset18 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset19 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 5); - ((self_in_dispatchConcretize->machineCode))[2] = (offset18 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset18) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset18) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset18) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[2] = (offset19 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset19) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset19) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset19) >> 24) & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 6); return; @@ -8651,13 +8651,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget120 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget120); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget120)) { - jumpTarget120 = ((AbstractInstruction *) ((jumpTarget120->address))); + jumpTarget119 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget119); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget119)) { + jumpTarget119 = ((AbstractInstruction *) ((jumpTarget119->address))); } - assert(jumpTarget120 != 0); - jumpTarget29 = jumpTarget120; + assert(jumpTarget119 != 0); + jumpTarget29 = jumpTarget119; offset26 = (((sqInt) jumpTarget29)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset26) @@ -8670,13 +8670,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget119 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget119); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget119)) { - jumpTarget119 = ((AbstractInstruction *) ((jumpTarget119->address))); + jumpTarget1110 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1110); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1110)) { + jumpTarget1110 = ((AbstractInstruction *) ((jumpTarget1110->address))); } - assert(jumpTarget119 != 0); - jumpTarget210 = jumpTarget119; + assert(jumpTarget1110 != 0); + jumpTarget210 = jumpTarget1110; offset116 = (((sqInt) jumpTarget210)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 12); @@ -8691,13 +8691,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget121 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget121); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget121)) { - jumpTarget121 = ((AbstractInstruction *) ((jumpTarget121->address))); + jumpTarget120 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget120); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget120)) { + jumpTarget120 = ((AbstractInstruction *) ((jumpTarget120->address))); } - assert(jumpTarget121 != 0); - jumpTarget30 = jumpTarget121; + assert(jumpTarget120 != 0); + jumpTarget30 = jumpTarget120; offset27 = (((sqInt) jumpTarget30)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset27) @@ -8710,13 +8710,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1110 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1110); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1110)) { - jumpTarget1110 = ((AbstractInstruction *) ((jumpTarget1110->address))); + jumpTarget1111 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1111); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1111)) { + jumpTarget1111 = ((AbstractInstruction *) ((jumpTarget1111->address))); } - assert(jumpTarget1110 != 0); - jumpTarget211 = jumpTarget1110; + assert(jumpTarget1111 != 0); + jumpTarget211 = jumpTarget1111; offset117 = (((sqInt) jumpTarget211)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 13); @@ -8731,13 +8731,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget122 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget122); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget122)) { - jumpTarget122 = ((AbstractInstruction *) ((jumpTarget122->address))); + jumpTarget121 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget121); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget121)) { + jumpTarget121 = ((AbstractInstruction *) ((jumpTarget121->address))); } - assert(jumpTarget122 != 0); - jumpTarget31 = jumpTarget122; + assert(jumpTarget121 != 0); + jumpTarget31 = jumpTarget121; offset28 = (((sqInt) jumpTarget31)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset28) @@ -8750,13 +8750,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1111 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1111); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1111)) { - jumpTarget1111 = ((AbstractInstruction *) ((jumpTarget1111->address))); + jumpTarget1112 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1112); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1112)) { + jumpTarget1112 = ((AbstractInstruction *) ((jumpTarget1112->address))); } - assert(jumpTarget1111 != 0); - jumpTarget212 = jumpTarget1111; + assert(jumpTarget1112 != 0); + jumpTarget212 = jumpTarget1112; offset118 = (((sqInt) jumpTarget212)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 15); @@ -8771,13 +8771,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget123 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget123); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget123)) { - jumpTarget123 = ((AbstractInstruction *) ((jumpTarget123->address))); + jumpTarget122 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget122); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget122)) { + jumpTarget122 = ((AbstractInstruction *) ((jumpTarget122->address))); } - assert(jumpTarget123 != 0); - jumpTarget32 = jumpTarget123; + assert(jumpTarget122 != 0); + jumpTarget32 = jumpTarget122; offset29 = (((sqInt) jumpTarget32)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset29) @@ -8790,13 +8790,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1112 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1112); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1112)) { - jumpTarget1112 = ((AbstractInstruction *) ((jumpTarget1112->address))); + jumpTarget1113 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1113); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1113)) { + jumpTarget1113 = ((AbstractInstruction *) ((jumpTarget1113->address))); } - assert(jumpTarget1112 != 0); - jumpTarget213 = jumpTarget1112; + assert(jumpTarget1113 != 0); + jumpTarget213 = jumpTarget1113; offset119 = (((sqInt) jumpTarget213)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 14); @@ -8812,13 +8812,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget124 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget124); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget124)) { - jumpTarget124 = ((AbstractInstruction *) ((jumpTarget124->address))); + jumpTarget123 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget123); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget123)) { + jumpTarget123 = ((AbstractInstruction *) ((jumpTarget123->address))); } - assert(jumpTarget124 != 0); - jumpTarget33 = jumpTarget124; + assert(jumpTarget123 != 0); + jumpTarget33 = jumpTarget123; offset30 = (((sqInt) jumpTarget33)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset30) @@ -8831,13 +8831,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1113 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1113); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1113)) { - jumpTarget1113 = ((AbstractInstruction *) ((jumpTarget1113->address))); + jumpTarget1114 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1114); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1114)) { + jumpTarget1114 = ((AbstractInstruction *) ((jumpTarget1114->address))); } - assert(jumpTarget1113 != 0); - jumpTarget214 = jumpTarget1113; + assert(jumpTarget1114 != 0); + jumpTarget214 = jumpTarget1114; offset120 = (((sqInt) jumpTarget214)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 7); @@ -8853,13 +8853,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget125 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget125); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget125)) { - jumpTarget125 = ((AbstractInstruction *) ((jumpTarget125->address))); + jumpTarget124 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget124); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget124)) { + jumpTarget124 = ((AbstractInstruction *) ((jumpTarget124->address))); } - assert(jumpTarget125 != 0); - jumpTarget34 = jumpTarget125; + assert(jumpTarget124 != 0); + jumpTarget34 = jumpTarget124; offset31 = (((sqInt) jumpTarget34)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset31) @@ -8872,13 +8872,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1114 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1114); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1114)) { - jumpTarget1114 = ((AbstractInstruction *) ((jumpTarget1114->address))); + jumpTarget1115 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1115); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1115)) { + jumpTarget1115 = ((AbstractInstruction *) ((jumpTarget1115->address))); } - assert(jumpTarget1114 != 0); - jumpTarget215 = jumpTarget1114; + assert(jumpTarget1115 != 0); + jumpTarget215 = jumpTarget1115; offset121 = (((sqInt) jumpTarget215)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 6); @@ -8893,13 +8893,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget126 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget126); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget126)) { - jumpTarget126 = ((AbstractInstruction *) ((jumpTarget126->address))); + jumpTarget125 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget125); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget125)) { + jumpTarget125 = ((AbstractInstruction *) ((jumpTarget125->address))); } - assert(jumpTarget126 != 0); - jumpTarget35 = jumpTarget126; + assert(jumpTarget125 != 0); + jumpTarget35 = jumpTarget125; offset32 = (((sqInt) jumpTarget35)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset32) @@ -8912,13 +8912,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1115 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1115); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1115)) { - jumpTarget1115 = ((AbstractInstruction *) ((jumpTarget1115->address))); + jumpTarget1116 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1116); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1116)) { + jumpTarget1116 = ((AbstractInstruction *) ((jumpTarget1116->address))); } - assert(jumpTarget1115 != 0); - jumpTarget216 = jumpTarget1115; + assert(jumpTarget1116 != 0); + jumpTarget216 = jumpTarget1116; offset122 = (((sqInt) jumpTarget216)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 11); @@ -8933,13 +8933,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget127 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget127); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget127)) { - jumpTarget127 = ((AbstractInstruction *) ((jumpTarget127->address))); + jumpTarget126 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget126); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget126)) { + jumpTarget126 = ((AbstractInstruction *) ((jumpTarget126->address))); } - assert(jumpTarget127 != 0); - jumpTarget36 = jumpTarget127; + assert(jumpTarget126 != 0); + jumpTarget36 = jumpTarget126; offset33 = (((sqInt) jumpTarget36)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset33) @@ -8952,13 +8952,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1116 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1116); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1116)) { - jumpTarget1116 = ((AbstractInstruction *) ((jumpTarget1116->address))); + jumpTarget1117 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1117); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1117)) { + jumpTarget1117 = ((AbstractInstruction *) ((jumpTarget1117->address))); } - assert(jumpTarget1116 != 0); - jumpTarget217 = jumpTarget1116; + assert(jumpTarget1117 != 0); + jumpTarget217 = jumpTarget1117; offset123 = (((sqInt) jumpTarget217)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 10); @@ -10935,13 +10935,15 @@ genCheckForInterruptsTrampoline(void) { sqInt address; + sqInt address1; opcodeIndex = 0; /* begin PopR: */ genoperand(PopR, TempReg); /* begin MoveR:Aw: */ - address = instructionPointerAddress(); - genoperandoperand(MoveRAw, TempReg, address); + address1 = instructionPointerAddress(); + genoperandoperand(MoveRAw, TempReg, address1); + return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceCheckForInterrupts, "ceCheckForInterruptsTrampoline", 1, 0, null, null, null, null, 0, null, 1); } @@ -11263,6 +11265,7 @@ genoperand(PopR, regArg2); /* begin PopR: */ genoperand(PopR, regArg1); + /* begin RetN: */ genoperand(RetN, 0); computeMaximumSizes(); @@ -11297,6 +11300,7 @@ genoperand(PopR, regArg2); /* begin PopR: */ genoperand(PopR, regArg1); + /* begin RetN: */ genoperand(RetN, 0); computeMaximumSizes(); @@ -11329,6 +11333,7 @@ genLoadStackPointers(backEnd); /* begin PopR: */ genoperand(PopR, regArg); + /* begin RetN: */ genoperand(RetN, 0); computeMaximumSizes(); @@ -11424,21 +11429,24 @@ sqInt address; sqInt address1; sqInt address2; + sqInt address3; genPushRegisterArgs(); /* begin MoveMw:r:R: */ genoperandoperandoperand(MoveMwrR, 0, SPReg, ClassReg); + /* begin MoveR:Aw: */ - address = framePointerAddress(); - genoperandoperand(MoveRAw, FPReg, address); + address2 = framePointerAddress(); + genoperandoperand(MoveRAw, FPReg, address2); /* begin LoadEffectiveAddressMw:r:R: */ genoperandoperandoperand(LoadEffectiveAddressMwrR, BytesPerWord, SPReg, TempReg); /* begin MoveR:Aw: */ address1 = instructionPointerAddress(); genoperandoperand(MoveRAw, ClassReg, address1); + /* begin MoveR:Aw: */ - address2 = stackPointerAddress(); - genoperandoperand(MoveRAw, TempReg, address2); + address3 = stackPointerAddress(); + genoperandoperand(MoveRAw, TempReg, address3); return 0; } @@ -13782,13 +13790,15 @@ genNonLocalReturnTrampoline(void) { sqInt address; + sqInt address1; opcodeIndex = 0; /* begin PopR: */ genoperand(PopR, TempReg); /* begin MoveR:Aw: */ - address = instructionPointerAddress(); - genoperandoperand(MoveRAw, TempReg, address); + address1 = instructionPointerAddress(); + genoperandoperand(MoveRAw, TempReg, address1); + return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceNonLocalReturn, "ceNonLocalReturnTrampoline", 1, 1, ReceiverResultReg, null, null, null, 0, null, 1); } @@ -15345,6 +15355,7 @@ /* begin PopR: */ genoperand(PopR, FPReg); } + /* begin RetN: */ genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); return 0; @@ -16522,10 +16533,12 @@ genoperandoperand(MoveRR, FPReg, SPReg); /* begin PopR: */ genoperand(PopR, FPReg); + /* begin RetN: */ genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } else { + ; /* begin RetN: */ offset = ((methodOrBlockNumArgs > 1) || (regArgsHaveBeenPushed) Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-05-28 15:19:56 UTC (rev 2932) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-05-29 01:02:01 UTC (rev 2933) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa + CCodeGenerator VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-28 15:19:56 UTC (rev 2932) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-29 01:02:01 UTC (rev 2933) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa + CCodeGenerator VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-05-28 15:19:56 UTC (rev 2932) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-05-29 01:02:01 UTC (rev 2933) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 from - CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CoInterpreter VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2058,7 +2058,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.733"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.735"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4851,6 +4851,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l309; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4868,7 +4869,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l309: /* end baseFrameReturn */; goto l306; } @@ -47489,7 +47490,7 @@ printFrameOopindexat("arg", numArgs - i, (theFP + FoxCallerSavedIP) + (i * BytesPerWord)); } printFrameThingatextraString("caller ip", theFP + FoxCallerSavedIP, ((longAt(theFP + FoxCallerSavedIP)) == (ceReturnToInterpreterPC()) - ? "ceReturnToInterptreter" + ? "ceReturnToInterpreter" : 0)); printFrameThingat("saved fp", theFP + FoxSavedFP); printFrameMethodFor(theFP); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-05-28 15:19:56 UTC (rev 2932) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-05-29 01:02:01 UTC (rev 2933) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-28 15:19:56 UTC (rev 2932) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-29 01:02:01 UTC (rev 2933) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 from - CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CoInterpreter VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2061,7 +2061,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.733"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.735"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4860,6 +4860,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l309; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4877,7 +4878,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l309: /* end baseFrameReturn */; goto l306; } @@ -47498,7 +47499,7 @@ printFrameOopindexat("arg", numArgs - i, (theFP + FoxCallerSavedIP) + (i * BytesPerWord)); } printFrameThingatextraString("caller ip", theFP + FoxCallerSavedIP, ((longAt(theFP + FoxCallerSavedIP)) == (ceReturnToInterpreterPC()) - ? "ceReturnToInterptreter" + ? "ceReturnToInterpreter" : 0)); printFrameThingat("saved fp", theFP + FoxSavedFP); printFrameMethodFor(theFP); Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-05-28 15:19:56 UTC (rev 2932) +++ branches/Cog/nscogsrc/vm/interp.h 2014-05-29 01:02:01 UTC (rev 2933) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-28 15:19:56 UTC (rev 2932) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-29 01:02:01 UTC (rev 2933) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-05-28 15:19:56 UTC (rev 2932) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-05-29 01:02:01 UTC (rev 2933) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa + CCodeGenerator VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 from - StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa + StackToRegisterMappingCogit VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -7712,6 +7712,7 @@ AbstractInstruction *jumpTarget1114; AbstractInstruction *jumpTarget1115; AbstractInstruction *jumpTarget1116; + AbstractInstruction *jumpTarget1117; AbstractInstruction *jumpTarget112; AbstractInstruction *jumpTarget113; AbstractInstruction *jumpTarget114; @@ -7728,7 +7729,6 @@ AbstractInstruction *jumpTarget124; AbstractInstruction *jumpTarget125; AbstractInstruction *jumpTarget126; - AbstractInstruction *jumpTarget127; AbstractInstruction *jumpTarget13; AbstractInstruction *jumpTarget14; AbstractInstruction *jumpTarget15; @@ -8265,12 +8265,12 @@ } assert(jumpTarget13 != 0); jumpTarget4 = jumpTarget13; - offset17 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset16 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset17) + ? isQuick(self_in_dispatchConcretize, offset16) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 4); - ((self_in_dispatchConcretize->machineCode))[1] = (offset17 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset16 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -8284,13 +8284,13 @@ } assert(jumpTarget111 != 0); jumpTarget21 = jumpTarget111; - offset16 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset17 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 4); - ((self_in_dispatchConcretize->machineCode))[2] = (offset16 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset16) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset16) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset16) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[2] = (offset17 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset17) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 24) & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 6); return; @@ -8306,12 +8306,12 @@ } assert(jumpTarget14 != 0); jumpTarget5 = jumpTarget14; - offset19 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset18 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset19) + ? isQuick(self_in_dispatchConcretize, offset18) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 5); - ((self_in_dispatchConcretize->machineCode))[1] = (offset19 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset18 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -8325,13 +8325,13 @@ } assert(jumpTarget112 != 0); jumpTarget22 = jumpTarget112; - offset18 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset19 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 5); - ((self_in_dispatchConcretize->machineCode))[2] = (offset18 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset18) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset18) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset18) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[2] = (offset19 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset19) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset19) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset19) >> 24) & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 6); return; @@ -8583,13 +8583,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget120 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget120); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget120)) { - jumpTarget120 = ((AbstractInstruction *) ((jumpTarget120->address))); + jumpTarget119 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget119); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget119)) { + jumpTarget119 = ((AbstractInstruction *) ((jumpTarget119->address))); } - assert(jumpTarget120 != 0); - jumpTarget29 = jumpTarget120; + assert(jumpTarget119 != 0); + jumpTarget29 = jumpTarget119; offset26 = (((sqInt) jumpTarget29)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset26) @@ -8602,13 +8602,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget119 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget119); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget119)) { - jumpTarget119 = ((AbstractInstruction *) ((jumpTarget119->address))); + jumpTarget1110 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1110); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1110)) { + jumpTarget1110 = ((AbstractInstruction *) ((jumpTarget1110->address))); } - assert(jumpTarget119 != 0); - jumpTarget210 = jumpTarget119; + assert(jumpTarget1110 != 0); + jumpTarget210 = jumpTarget1110; offset116 = (((sqInt) jumpTarget210)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 12); @@ -8623,13 +8623,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget121 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget121); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget121)) { - jumpTarget121 = ((AbstractInstruction *) ((jumpTarget121->address))); + jumpTarget120 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget120); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget120)) { + jumpTarget120 = ((AbstractInstruction *) ((jumpTarget120->address))); } - assert(jumpTarget121 != 0); - jumpTarget30 = jumpTarget121; + assert(jumpTarget120 != 0); + jumpTarget30 = jumpTarget120; offset27 = (((sqInt) jumpTarget30)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset27) @@ -8642,13 +8642,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1110 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1110); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1110)) { - jumpTarget1110 = ((AbstractInstruction *) ((jumpTarget1110->address))); + jumpTarget1111 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1111); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1111)) { + jumpTarget1111 = ((AbstractInstruction *) ((jumpTarget1111->address))); } - assert(jumpTarget1110 != 0); - jumpTarget211 = jumpTarget1110; + assert(jumpTarget1111 != 0); + jumpTarget211 = jumpTarget1111; offset117 = (((sqInt) jumpTarget211)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 13); @@ -8663,13 +8663,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget122 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget122); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget122)) { - jumpTarget122 = ((AbstractInstruction *) ((jumpTarget122->address))); + jumpTarget121 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget121); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget121)) { + jumpTarget121 = ((AbstractInstruction *) ((jumpTarget121->address))); } - assert(jumpTarget122 != 0); - jumpTarget31 = jumpTarget122; + assert(jumpTarget121 != 0); + jumpTarget31 = jumpTarget121; offset28 = (((sqInt) jumpTarget31)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset28) @@ -8682,13 +8682,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1111 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1111); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1111)) { - jumpTarget1111 = ((AbstractInstruction *) ((jumpTarget1111->address))); + jumpTarget1112 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1112); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1112)) { + jumpTarget1112 = ((AbstractInstruction *) ((jumpTarget1112->address))); } - assert(jumpTarget1111 != 0); - jumpTarget212 = jumpTarget1111; + assert(jumpTarget1112 != 0); + jumpTarget212 = jumpTarget1112; offset118 = (((sqInt) jumpTarget212)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 15); @@ -8703,13 +8703,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget123 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget123); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget123)) { - jumpTarget123 = ((AbstractInstruction *) ((jumpTarget123->address))); + jumpTarget122 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget122); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget122)) { + jumpTarget122 = ((AbstractInstruction *) ((jumpTarget122->address))); } - assert(jumpTarget123 != 0); - jumpTarget32 = jumpTarget123; + assert(jumpTarget122 != 0); + jumpTarget32 = jumpTarget122; offset29 = (((sqInt) jumpTarget32)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset29) @@ -8722,13 +8722,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1112 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1112); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1112)) { - jumpTarget1112 = ((AbstractInstruction *) ((jumpTarget1112->address))); + jumpTarget1113 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1113); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1113)) { + jumpTarget1113 = ((AbstractInstruction *) ((jumpTarget1113->address))); } - assert(jumpTarget1112 != 0); - jumpTarget213 = jumpTarget1112; + assert(jumpTarget1113 != 0); + jumpTarget213 = jumpTarget1113; offset119 = (((sqInt) jumpTarget213)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 14); @@ -8744,13 +8744,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget124 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget124); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget124)) { - jumpTarget124 = ((AbstractInstruction *) ((jumpTarget124->address))); + jumpTarget123 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget123); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget123)) { + jumpTarget123 = ((AbstractInstruction *) ((jumpTarget123->address))); } - assert(jumpTarget124 != 0); - jumpTarget33 = jumpTarget124; + assert(jumpTarget123 != 0); + jumpTarget33 = jumpTarget123; offset30 = (((sqInt) jumpTarget33)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset30) @@ -8763,13 +8763,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1113 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1113); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1113)) { - jumpTarget1113 = ((AbstractInstruction *) ((jumpTarget1113->address))); + jumpTarget1114 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1114); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1114)) { + jumpTarget1114 = ((AbstractInstruction *) ((jumpTarget1114->address))); } - assert(jumpTarget1113 != 0); - jumpTarget214 = jumpTarget1113; + assert(jumpTarget1114 != 0); + jumpTarget214 = jumpTarget1114; offset120 = (((sqInt) jumpTarget214)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 7); @@ -8785,13 +8785,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget125 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget125); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget125)) { - jumpTarget125 = ((AbstractInstruction *) ((jumpTarget125->address))); + jumpTarget124 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget124); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget124)) { + jumpTarget124 = ((AbstractInstruction *) ((jumpTarget124->address))); } - assert(jumpTarget125 != 0); - jumpTarget34 = jumpTarget125; + assert(jumpTarget124 != 0); + jumpTarget34 = jumpTarget124; offset31 = (((sqInt) jumpTarget34)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset31) @@ -8804,13 +8804,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1114 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1114); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1114)) { - jumpTarget1114 = ((AbstractInstruction *) ((jumpTarget1114->address))); + jumpTarget1115 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1115); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1115)) { + jumpTarget1115 = ((AbstractInstruction *) ((jumpTarget1115->address))); } - assert(jumpTarget1114 != 0); - jumpTarget215 = jumpTarget1114; + assert(jumpTarget1115 != 0); + jumpTarget215 = jumpTarget1115; offset121 = (((sqInt) jumpTarget215)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 6); @@ -8825,13 +8825,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget126 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget126); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget126)) { - jumpTarget126 = ((AbstractInstruction *) ((jumpTarget126->address))); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.735.mcz
by commits＠source.squeak.org 29 May '14

29 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.735.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.735 Author: eem Time: 28 May 2014, 5:46:02.34 pm UUID: ee13367a-8346-4ce8-a124-276cba680fc1 Ancestors: VMMaker.oscog-eem.734 Spur: Fix management of lastFreeChunk during compaction (in sweepToCoallesceFreeSpaceForPigCompactFrom: and freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact). lastFreeChunk's link was not being correctly terminated. Add asserts to chunk freers to check for free chunks overlapping, which caught the compaction bug. Make sure that endOfMemory is immediately below the last bridge. This is where it was set when adding a new segment, but on loading a snapshot it was mispositioned at the end of the last bridge. Add a check to checkSegments, and use it in a few more places. Eliminate bogus assert in sortedFreeListPairwiseReverseDo:. If free gets used then lastFreeChunk won't point to it any more. Nuke obsolete method (from old non-repeating compact). Cogit: Correct link register usage in various places. e.g. enilopmarts, checkForInterrupts trampoline. But especially, correct link register usage in the return sequence generators. Since Tim and I agree that RetN: returns to the LinkReg, and no longer pops the return address from the stack, genUpArrowReturn and genReturnTopFromBlock must explicitly pop the saved return address into LinkReg before RetN:. That means that all the RetN:'s in machine code primitives will do the right thing, allowing these to avoid pushing LinkReg on entry. Simulator/Frame print: fix a typo, recategorize, add an accessor for assertVEPAES. =============== Diff against VMMaker.oscog-eem.734 =============== Item was changed: ----- Method: CoInterpreter>>printFrame:WithSP: (in category 'debug printing') ----- printFrame: theFP WithSP: theSP <api> | theMethod theMethodEnd numArgs numTemps rcvrAddress topThing | <inline: false> <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #addr type: #'char *'> <var: #rcvrAddress type: #'char *'> <var: #cogMethod type: #'CogBlockMethod *'> <var: #homeMethod type: #'CogMethod *'> self cCode: '' inSmalltalk: [self transcript ensureCr]. (self isMachineCodeFrame: theFP) ifTrue: [| cogMethod homeMethod | cogMethod := self mframeCogMethod: theFP. homeMethod := self mframeHomeMethod: theFP. theMethod := homeMethod asInteger. theMethodEnd := homeMethod asInteger + homeMethod blockSize. numArgs := cogMethod cmNumArgs. numTemps := self temporaryCountOfMethodHeader: homeMethod methodHeader] ifFalse: [theMethod := self frameMethodObject: theFP. theMethodEnd := theMethod + (objectMemory sizeBitsOfSafe: theMethod). numArgs := self iframeNumArgs: theFP. numTemps := self tempCountOf: theMethod]. (self frameIsBlockActivation: theFP) ifTrue: [| rcvrOrClosure | "No BlockLocalTempCounter in the Cogit's C code, so quick hack is to use numCopied + numArgs" rcvrOrClosure := self pushedReceiverOrClosureOfFrame: theFP. ((objectMemory isNonImmediate: rcvrOrClosure) and: [(objectMemory addressCouldBeObj: rcvrOrClosure) and: [(objectMemory fetchClassOfNonImm: rcvrOrClosure) = (objectMemory splObj: ClassBlockClosure)]]) ifTrue: [numTemps := numArgs + (self stSizeOf: rcvrOrClosure)] ifFalse: [numTemps := numArgs]]. self shortPrintFrame: theFP. (self isBaseFrame: theFP) ifTrue: [self printFrameOop: '(caller ctxt' at: theFP + (self frameStackedReceiverOffset: theFP) + (2 * BytesPerWord). self printFrameOop: '(saved ctxt' at: theFP + (self frameStackedReceiverOffset: theFP) + (1 * BytesPerWord)]. self printFrameOop: 'rcvr/clsr' at: theFP + FoxCallerSavedIP + ((numArgs + 1) * BytesPerWord). numArgs to: 1 by: -1 do: [:i| self printFrameOop: 'arg' index: numArgs - i at: theFP + FoxCallerSavedIP + (i * BytesPerWord)]. self printFrameThing: 'caller ip' at: theFP + FoxCallerSavedIP extraString: ((stackPages longAt: theFP + FoxCallerSavedIP) = cogit ceReturnToInterpreterPC ifTrue: + ['ceReturnToInterpreter']). - ['ceReturnToInterptreter']). self printFrameThing: 'saved fp' at: theFP + FoxSavedFP. self printFrameMethodFor: theFP. (self isMachineCodeFrame: theFP) ifTrue: [self printFrameFlagsForFP: theFP]. self printFrameOop: 'context' at: theFP + FoxThisContext. (self isMachineCodeFrame: theFP) ifFalse: [self printFrameFlagsForFP: theFP]. (self isMachineCodeFrame: theFP) ifTrue: [rcvrAddress := theFP + FoxMFReceiver] ifFalse: [self printFrameThing: 'saved ip' at: theFP + FoxIFSavedIP extra: ((self iframeSavedIP: theFP) = 0 ifTrue: [0] ifFalse: [(self iframeSavedIP: theFP) - theMethod + 2 - BaseHeaderSize]). rcvrAddress := theFP + FoxIFReceiver]. self printFrameOop: 'receiver' at: rcvrAddress. topThing := stackPages longAt: theSP. (topThing between: theMethod and: theMethodEnd) ifTrue: [rcvrAddress - BytesPerWord to: theSP + BytesPerWord by: BytesPerWord negated do: [:addr| | index | index := rcvrAddress - addr / BytesPerWord + numArgs. index <= numTemps ifTrue: [self printFrameOop: 'temp' index: index - 1 at: addr] ifFalse: [self printFrameOop: ((self frameIsBlockActivation: theFP) ifTrue: ['temp/stck'] ifFalse: ['stck']) at: addr]]. self printFrameThing: 'frame ip' at: theSP extra: ((self isMachineCodeFrame: theFP) ifTrue: [topThing - theMethod] ifFalse: [topThing - theMethod + 2 - BaseHeaderSize])] ifFalse: [rcvrAddress - BytesPerWord to: theSP by: BytesPerWord negated do: [:addr| | index | index := rcvrAddress - addr / BytesPerWord + numArgs. index <= numTemps ifTrue: [self printFrameOop: 'temp' index: index - 1 at: addr] ifFalse: [self printFrameOop: ((self frameIsBlockActivation: theFP) ifTrue: ['temp/stck'] ifFalse: ['stck']) at: addr]]]! Item was changed: ----- Method: Cogit>>genCheckForInterruptsTrampoline (in category 'initialization') ----- genCheckForInterruptsTrampoline opcodeIndex := 0. + backEnd hasLinkRegister + ifTrue: + [self MoveR: LinkReg Aw: coInterpreter instructionPointerAddress] + ifFalse: + [self PopR: TempReg. "instruction pointer" + self MoveR: TempReg Aw: coInterpreter instructionPointerAddress]. - self PopR: TempReg. "instruction pointer" - self MoveR: TempReg Aw: coInterpreter instructionPointerAddress. ^self genTrampolineFor: #ceCheckForInterrupts called: 'ceCheckForInterruptsTrampoline' callJumpBar: true numArgs: 0 arg: nil arg: nil arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true! Item was changed: ----- Method: Cogit>>genEnilopmartFor:and:and:called: (in category 'initialization') ----- genEnilopmartFor: regArg1 and: regArg2 and: regArg3 called: trampolineName "An enilopmart (the reverse of a trampoline) is a piece of code that makes the system-call-like transition from the C runtime into generated machine code. The desired arguments and entry-point are pushed on a stackPage's stack. The enilopmart pops off the values to be loaded into registers and then executes a return instruction to pop off the entry-point and jump to it." <returnTypeC: 'void (*genEnilopmartForandandcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, char *trampolineName))(void)'> | size endAddress enilopmart | opcodeIndex := 0. backEnd genLoadStackPointers. self PopR: regArg3. self PopR: regArg2. self PopR: regArg1. + backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. self RetN: 0. self computeMaximumSizes. size := self generateInstructionsAt: methodZoneBase. endAddress := self outputInstructionsAt: methodZoneBase. self assert: methodZoneBase + size = endAddress. enilopmart := methodZoneBase. methodZoneBase := self alignUptoRoutineBoundary: endAddress. backEnd nopsFrom: endAddress to: methodZoneBase - 1. self recordGeneratedRunTime: trampolineName address: enilopmart. ^self cCoerceSimple: enilopmart to: #'void (*)(void)'! Item was changed: ----- Method: Cogit>>genEnilopmartFor:and:called: (in category 'initialization') ----- genEnilopmartFor: regArg1 and: regArg2 called: trampolineName "An enilopmart (the reverse of a trampoline) is a piece of code that makes the system-call-like transition from the C runtime into generated machine code. The desired arguments and entry-point are pushed on a stackPage's stack. The enilopmart pops off the values to be loaded into registers and then executes a return instruction to pop off the entry-point and jump to it." <returnTypeC: 'void (*genEnilopmartForandcalled(sqInt regArg1, sqInt regArg2, char *trampolineName))(void)'> | size endAddress enilopmart | opcodeIndex := 0. backEnd genLoadStackPointers. self PopR: regArg2. self PopR: regArg1. + backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. self RetN: 0. self computeMaximumSizes. size := self generateInstructionsAt: methodZoneBase. endAddress := self outputInstructionsAt: methodZoneBase. self assert: methodZoneBase + size = endAddress. enilopmart := methodZoneBase. methodZoneBase := self alignUptoRoutineBoundary: endAddress. backEnd nopsFrom: endAddress to: methodZoneBase - 1. self recordGeneratedRunTime: trampolineName address: enilopmart. ^self cCoerceSimple: enilopmart to: #'void (*)(void)'! Item was changed: ----- Method: Cogit>>genEnilopmartFor:called: (in category 'initialization') ----- genEnilopmartFor: regArg called: trampolineName "An enilopmart (the reverse of a trampoline) is a piece of code that makes the system-call-like transition from the C runtime into generated machine code. The desired arguments and entry-point are pushed on a stackPage's stack. The enilopmart pops off the values to be loaded into registers and then executes a return instruction to pop off the entry-point and jump to it." <returnTypeC: 'void (*genEnilopmartForcalled(sqInt regArg, char *trampolineName))(void)'> | size endAddress enilopmart | opcodeIndex := 0. backEnd genLoadStackPointers. self PopR: regArg. + backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. self RetN: 0. self computeMaximumSizes. size := self generateInstructionsAt: methodZoneBase. endAddress := self outputInstructionsAt: methodZoneBase. self assert: methodZoneBase + size = endAddress. enilopmart := methodZoneBase. methodZoneBase := self alignUptoRoutineBoundary: endAddress. backEnd nopsFrom: endAddress to: methodZoneBase - 1. self recordGeneratedRunTime: trampolineName address: enilopmart. ^self cCoerceSimple: enilopmart to: #'void (*)(void)'! Item was changed: ----- Method: Cogit>>genExternalizePointersForPrimitiveCall (in category 'trampoline support') ----- genExternalizePointersForPrimitiveCall + backEnd hasLinkRegister + ifTrue: [self PushR: LinkReg] + ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. - self MoveMw: 0 r: SPReg R: ClassReg. self MoveR: FPReg Aw: coInterpreter framePointerAddress. "Set coInterpreter stackPointer to the topmost argument, skipping the return address." self LoadEffectiveAddressMw: BytesPerWord r: SPReg R: TempReg. + backEnd hasLinkRegister + ifTrue: [self MoveR: LinkReg Aw: coInterpreter instructionPointerAddress] + ifFalse: [self MoveR: ClassReg Aw: coInterpreter instructionPointerAddress]. - self MoveR: ClassReg Aw: coInterpreter instructionPointerAddress. self MoveR: TempReg Aw: coInterpreter stackPointerAddress. ^0! Item was changed: ----- Method: Cogit>>genNonLocalReturnTrampoline (in category 'initialization') ----- genNonLocalReturnTrampoline opcodeIndex := 0. + backEnd hasLinkRegister + ifTrue: + [self MoveR: LinkReg Aw: coInterpreter instructionPointerAddress] + ifFalse: + [self PopR: TempReg. "instruction pointer" + self MoveR: TempReg Aw: coInterpreter instructionPointerAddress]. - self PopR: TempReg. "instruction pointer" - self MoveR: TempReg Aw: coInterpreter instructionPointerAddress. ^self genTrampolineFor: #ceNonLocalReturn: called: 'ceNonLocalReturnTrampoline' callJumpBar: true numArgs: 1 arg: ReceiverResultReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true! Item was changed: ----- Method: SimpleStackBasedCogit>>genReturnTopFromBlock (in category 'bytecode generators') ----- genReturnTopFromBlock self assert: inBlock. self flag: 'currently caller pushes result'. self PopR: ReceiverResultReg. needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg]. + backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. self RetN: methodOrBlockNumArgs + 1 * BytesPerWord. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genUpArrowReturn (in category 'bytecode generators') ----- genUpArrowReturn "Generate a method return from within a method or a block. Frameless method activation looks like receiver args sp-> ret pc. Return pops receiver and arguments off the stack. Callee pushes the result." self flag: 'currently caller pushes result'. inBlock ifTrue: [self assert: needsFrame. self annotateBytecode: (self CallRT: ceNonLocalReturnTrampoline). ^0]. needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg]. + backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. self RetN: methodOrBlockNumArgs + 1 * BytesPerWord. ^0! Item was changed: ----- Method: SpurMemoryManager>>addFreeSubTree: (in category 'free space') ----- addFreeSubTree: freeTree "Add a freeChunk sub tree back into the large free chunk tree. This is for allocateOldSpaceChunkOf[Exactly]Bytes:[suchThat:]." | bytesInArg treeNode bytesInNode subNode | "N.B. *can't* use numSlotsOfAny: because of rounding up of odd slots and/or step in size at 1032 bytes in 32-bits or 2048 bytes in 64-bits." self assert: (self isFreeObject: freeTree). bytesInArg := self bytesInObject: freeTree. self assert: bytesInArg >= (self numFreeLists * self allocationUnit). treeNode := freeLists at: 0. self assert: treeNode ~= 0. [bytesInNode := self bytesInObject: treeNode. + self assert: ((self oop: freeTree + bytesInArg isLessThan: treeNode) + or: [self oop: freeTree isGreaterThanOrEqualTo: treeNode + bytesInNode]). self assert: bytesInNode >= (self numFreeLists * self allocationUnit). self assert: bytesInArg ~= bytesInNode. bytesInNode > bytesInArg ifTrue: [subNode := self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: treeNode. subNode = 0 ifTrue: [self storePointer: self freeChunkSmallerIndex ofFreeChunk: treeNode withValue: freeTree. self storePointer: self freeChunkParentIndex ofFreeChunk: freeTree withValue: treeNode. ^self]] ifFalse: [subNode := self fetchPointer: self freeChunkLargerIndex ofFreeChunk: treeNode. subNode = 0 ifTrue: [self storePointer: self freeChunkLargerIndex ofFreeChunk: treeNode withValue: freeTree. self storePointer: self freeChunkParentIndex ofFreeChunk: freeTree withValue: treeNode. ^self]]. treeNode := subNode] repeat! Item was changed: ----- Method: SpurMemoryManager>>addToFreeTree:bytes: (in category 'free space') ----- addToFreeTree: freeChunk bytes: chunkBytes "Add freeChunk to the large free chunk tree. For the benefit of sortedFreeObject:, answer the treeNode it is added to, if it is added to the next list of a freeTreeNode, otherwise answer 0." | childBytes parent child | self assert: (self isFreeObject: freeChunk). self assert: chunkBytes = (self bytesInObject: freeChunk). self assert: chunkBytes >= (self numFreeLists * self allocationUnit). self storePointer: self freeChunkNextIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkParentIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkSmallerIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkLargerIndex ofFreeChunk: freeChunk withValue: 0. "Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks." parent := 0. child := freeLists at: 0. [child ~= 0] whileTrue: [childBytes := self bytesInObject: child. + self assert: ((self oop: freeChunk + chunkBytes isLessThan: child) + or: [self oop: freeChunk isGreaterThanOrEqualTo: child + childBytes]). childBytes = chunkBytes ifTrue: "size match; add to list at node." [self storePointer: self freeChunkNextIndex ofFreeChunk: freeChunk withValue: (self fetchPointer: self freeChunkNextIndex ofObject: child); storePointer: self freeChunkNextIndex ofFreeChunk: child withValue: freeChunk. ^child]. "walk down the tree" parent := child. child := self fetchPointer: (childBytes > chunkBytes ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: child]. parent = 0 ifTrue: [self assert: (freeLists at: 0) = 0. freeLists at: 0 put: freeChunk. freeListsMask := freeListsMask bitOr: 1. ^0]. self assert: (freeListsMask anyMask: 1). "insert in tree" self storePointer: self freeChunkParentIndex ofFreeChunk: freeChunk withValue: parent. self storePointer: (childBytes > chunkBytes ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: parent withValue: freeChunk. ^0! Item was changed: ----- Method: SpurMemoryManager>>compact (in category 'compaction') ----- compact "We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory." <inline: false> statCompactPassCount := statCompactPassCount + 1. self assert: (firstFreeChunk = 0 or: [self isFreeObject: firstFreeChunk]). 1 to: 3 do: [:i| self pigCompact. self eliminateAndFreeForwardersForPigCompact]. + + "The free lists are zeroed in freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact. + They should still be zero here" + self assert: self freeListHeadsEmpty. self rebuildFreeListsForPigCompact! Item was added: + ----- Method: SpurMemoryManager>>freeListHeadsEmpty (in category 'free space') ----- + freeListHeadsEmpty + 0 to: self numFreeLists - 1 do: + [:i| (freeLists at: i) ~= 0 ifTrue: [^false]]. + ^true! Item was changed: ----- Method: SpurMemoryManager>>freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact (in category 'gc - global') ----- freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact "Sweep all of old space, freeing unmarked objects, coalescing free chunks, and sorting free space. Doubly-link the free chunks in address order through the freeChunkNextIndex field using the xor trick to use only one field, see e.g. The Art of Computer Programming, Vol 1, D.E. Knuth, 3rd Ed, Sec 2.2.4 `Circular Lists', exercise. 18 http://en.wikipedia.org/wiki/XOR_linked_list. Record the lowest free object in firstFreeChunk and the highest in lastFreeChunk. Let the segmentManager mark which segments contain pinned objects via notePinned:." | prevPrevFree prevFree | <inline: false> self checkFreeSpace. scavenger forgetUnmarkedRememberedObjects. self doScavenge: MarkOnTenure. segmentManager prepareForGlobalSweep."for notePinned:" "throw away the list heads, including the tree." self resetFreeListHeads. firstFreeChunk := prevPrevFree := prevFree := 0. self allOldSpaceEntitiesForCoalescingFrom: self firstObject do: [:o| self assert: (firstFreeChunk = 0 or: [self isFreeObject: firstFreeChunk]). (self isMarked: o) ifTrue: "forwarders should have been followed in markAndTrace:" [self assert: (self isForwarded: o) not. self setIsMarkedOf: o to: false. "this will unmark bridges. undo the damage in notePinned:" (self isPinned: o) ifTrue: [segmentManager notePinned: o]] ifFalse: "unmarked; two cases, an unreachable object or a free chunk." [| here | self assert: (self isRemembered: o) not. "scavenger should have cleared this above" here := self coallesceFreeChunk: o. self setObjectFree: here. self inSortedFreeListLink: prevFree to: here given: prevPrevFree. prevPrevFree := prevFree. prevFree := here]]. prevFree ~= firstFreeChunk ifTrue: [self storePointer: self freeChunkNextIndex ofFreeChunk: prevFree withValue: prevPrevFree]. lastFreeChunk := prevFree. + self inSortedFreeListLink: lastFreeChunk to: 0 given: prevPrevFree. + self checkTraversableSortedFreeList! - self cCode: [] inSmalltalk: [self checkTraversableSortedFreeList]! Item was changed: ----- Method: SpurMemoryManager>>growOldSpaceByAtLeast: (in category 'growing/shrinking memory') ----- growOldSpaceByAtLeast: minAmmount "Attempt to grow memory by at least minAmmount. Answer the size of the new segment, or nil if the attempt failed." | ammount | <var: #segInfo type: #'SpurSegmentInfo *'> "statGrowMemory counts attempts, not successes." statGrowMemory := statGrowMemory + 1. "we need to include overhead for a new object header plus the segment bridge." ammount := minAmmount + (self baseHeaderSize * 2 + self bridgeSize). "round up to the nearest power of two." ammount := 1 << (ammount - 1) highBit. "and grow by at least growHeadroom." ammount := ammount max: growHeadroom. ^(segmentManager addSegmentOfSize: ammount) ifNotNil: [:segInfo| self assimilateNewSegment: segInfo. "and add the new free chunk to the free list; done here instead of in assimilateNewSegment: for the assert" self addFreeChunkWithBytes: segInfo segSize - self bridgeSize at: segInfo segStart. self assert: (self addressAfter: (self objectStartingAt: segInfo segStart)) = (segInfo segLimit - self bridgeSize). self checkFreeSpace. + self checkSegments. segInfo segSize]! Item was changed: ----- Method: SpurMemoryManager>>initializeOldSpaceFirstFree: (in category 'free space') ----- initializeOldSpaceFirstFree: startOfFreeOldSpace <var: 'startOfFreeOldSpace' type: #usqLong> | limit freeOldStart freeChunk | <var: 'limit' type: #usqLong> <var: 'freeOldStart' type: #usqLong> limit := endOfMemory - self bridgeSize. limit > startOfFreeOldSpace ifTrue: [totalFreeOldSpace := totalFreeOldSpace + (limit - startOfFreeOldSpace). freeOldStart := startOfFreeOldSpace. self wordSize > 4 ifTrue: [[limit - freeOldStart >= (1 << 32)] whileTrue: [freeChunk := self freeChunkWithBytes: (1 << 32) at: freeOldStart. freeOldStart := freeOldStart + (1 << 32). self assert: freeOldStart = (self addressAfter: freeChunk)]]. freeOldStart < limit ifTrue: [freeChunk := self freeChunkWithBytes: limit - freeOldStart at: freeOldStart. self assert: (self addressAfter: freeChunk) = limit]]. + endOfMemory := endOfMemory - self bridgeSize. freeOldSpaceStart := endOfMemory. self checkFreeSpace! Item was changed: ----- Method: SpurMemoryManager>>rebuildFreeListsForPigCompact (in category 'compaction') ----- rebuildFreeListsForPigCompact "Rebuild the free lists from the doubly-linked free list." + <inline: false> + self checkTraversableSortedFreeList. totalFreeOldSpace := 0. self sortedFreeListDo: [:freeObj| | start bytes | bytes := (self bytesInObject: freeObj). start := self startOfObject: freeObj. self addFreeChunkWithBytes: bytes at: start]. self checkFreeSpace! Item was changed: ----- Method: SpurMemoryManager>>sortedFreeListPairwiseReverseDo: (in category 'compaction') ----- sortedFreeListPairwiseReverseDo: aBinaryBlock "Evaluate aBinaryBlock with adjacent entries in the free list, from high address to low address. The second argument is in fact the start of the next free chunk, not the free chunk itself. Use endOfMemory - bridgeSize as the second argument in the first evaluation." | free prevFree prevPrevFree | <inline: true> free := lastFreeChunk. prevPrevFree := prevFree := 0. [free ~= 0] whileTrue: [aBinaryBlock value: free value: (prevFree = 0 ifTrue: [endOfMemory - self bridgeSize] ifFalse: [self startOfObject: prevFree]). "post evaluation of aBinaryBlock the value of free may be invalid because moveARunOfObjectsStartingAt:upTo: may have filled it. So reconstruct the position in the enumeration." prevFree = 0 ifTrue: [self assert: free = lastFreeChunk. prevFree := lastFreeChunk. free := self nextInSortedFreeListLink: lastFreeChunk given: 0] ifFalse: [self assert: (self isFreeObject: prevFree). prevPrevFree = 0 ifTrue: + [prevPrevFree := lastFreeChunk. - [self assert: free = (self nextInSortedFreeListLink: lastFreeChunk given: 0). - prevPrevFree := lastFreeChunk. prevFree := self nextInSortedFreeListLink: lastFreeChunk given: 0] ifFalse: [self assert: (self isFreeObject: prevPrevFree). free := self nextInSortedFreeListLink: prevFree given: prevPrevFree. prevPrevFree := prevFree. prevFree := free]. + free := self nextInSortedFreeListLink: prevFree given: prevPrevFree]]! - free := self nextInSortedFreeListLink: prevFree given: prevPrevFree]] - - "| labels | - labels := Dictionary new. - labels - at: prevPrevFree put: 'ppf'; - at: prevFree put: 'pf'; - at: free put: 'f'; - at: nextFree put: 'f'. - self sortedFreeListPairwiseReverseDo: [:a :b| - Transcript cr; print: a; space. - (labels at: a ifAbsent: []) ifNotNil: [:l| Transcript nextPutAll: l]. - Transcript flush]"! Item was removed: - ----- Method: SpurMemoryManager>>sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: (in category 'compaction') ----- - sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: lowestForwarder - "Coallesce free chunks and forwarders and rebuild the free list." - | lowest firstFree firstFreeStart lastFree | - lowest := (lowestForwarder = 0 ifTrue: [endOfMemory] ifFalse: [lowestForwarder]) - min: (firstFreeChunk = 0 ifTrue: [endOfMemory] ifFalse: [firstFreeChunk]). - firstFree := totalFreeOldSpace := 0. - self allOldSpaceEntitiesForCoalescingFrom: lowest do: - [:o| - ((self isFreeObject: o) or: [self isForwarded: o]) - ifTrue: - [firstFree = 0 ifTrue: - [firstFree := o. - firstFreeStart := self startOfObject: o]. - lastFree := o] - ifFalse: - [firstFree ~= 0 ifTrue: - [| bytes | - bytes := (self addressAfter: lastFree) - firstFreeStart. - self addFreeChunkWithBytes: bytes at: firstFreeStart]. - firstFree := 0]]. - firstFree ~= 0 ifTrue: - [| bytes | - bytes := (self addressAfter: lastFree) - firstFreeStart. - self addFreeChunkWithBytes: bytes at: firstFreeStart]. - firstFreeChunk := lastFreeChunk := 0! Item was changed: ----- Method: SpurMemoryManager>>sweepToCoallesceFreeSpaceForPigCompactFrom: (in category 'compaction') ----- sweepToCoallesceFreeSpaceForPigCompactFrom: lowestForwarder "Coallesce free chunks and forwarders, maintaining the doubly-linked free list." | lowest firstOfFreeRun startOfFreeRun endOfFreeRun prevPrevFree prevFree | lowest := (lowestForwarder = 0 ifTrue: [endOfMemory] ifFalse: [lowestForwarder]) min: (firstFreeChunk = 0 ifTrue: [endOfMemory] ifFalse: [firstFreeChunk]). firstOfFreeRun := prevPrevFree := prevFree := 0. self allOldSpaceEntitiesFrom: lowest do: [:o| ((self isFreeObject: o) or: [self isForwarded: o]) ifTrue: [firstOfFreeRun = 0 ifTrue: [self setObjectFree: o. firstOfFreeRun := o. startOfFreeRun := self startOfObject: o]. endOfFreeRun := o] ifFalse: [firstOfFreeRun ~= 0 ifTrue: [| bytes | bytes := (self addressAfter: endOfFreeRun) - startOfFreeRun. firstOfFreeRun := self initFreeChunkWithBytes: bytes at: startOfFreeRun. self inSortedFreeListLink: prevFree to: firstOfFreeRun given: prevPrevFree. prevPrevFree := prevFree. prevFree := firstOfFreeRun. firstOfFreeRun := 0]]]. firstOfFreeRun ~= 0 ifTrue: [| bytes | bytes := (self addressAfter: endOfFreeRun) - startOfFreeRun. firstOfFreeRun := self initFreeChunkWithBytes: bytes at: startOfFreeRun. self inSortedFreeListLink: prevFree to: firstOfFreeRun given: prevPrevFree. prevPrevFree := prevFree. prevFree := firstOfFreeRun. firstOfFreeRun := 0]. prevFree ~= firstFreeChunk ifTrue: [self storePointer: self freeChunkNextIndex ofFreeChunk: prevFree withValue: prevPrevFree]. lastFreeChunk := prevFree. + self inSortedFreeListLink: lastFreeChunk to: 0 given: prevPrevFree. + self checkTraversableSortedFreeList! - self cCode: [] inSmalltalk: [self checkTraversableSortedFreeList]! Item was changed: ----- Method: SpurSegmentManager>>checkSegments (in category 'debug support') ----- checkSegments self assert: numSegments >= 1. 0 to: numSegments - 1 do: [:i| self assert: (manager addressCouldBeObj: (segments at: i) segStart). self assert: (self isValidSegmentBridge: (self bridgeAt: i))]. + self assert: (segments at: numSegments - 1) segLimit - manager bridgeSize = manager endOfMemory! - self assert: (segments at: numSegments - 1) segLimit = manager endOfMemory! Item was changed: ----- Method: SpurSegmentManager>>postSnapshot (in category 'snapshot') ----- postSnapshot "Restore all shortened segments to their proper size, re-freeing the trailing space." <inline: false> | seg | <var: #seg type: #'SpurSegmentInfo *'> "Set endOfMemory first, to avoid assert fails in freeChunkWithBytes:at:." seg := self addressOf: (segments at: numSegments - 1). seg lastFreeObject ifNil: [self assert: manager endOfMemory = (seg segLimit - manager bridgeSize)] ifNotNil: [manager setEndOfMemory: seg savedSegSize + seg segStart - manager bridgeSize]. numSegments - 1 to: 0 by: -1 do: [:i| seg := self addressOf: (segments at: i). seg lastFreeObject ifNotNil: [:freeChunk| | address | address := seg segLimit - manager bridgeSize. seg segSize: seg savedSegSize. self bridgeFrom: seg to: (i < (numSegments - 1) ifTrue: [self addressOf: (segments at: i + 1)]). manager addFreeChunkWithBytes: seg segLimit - address - manager bridgeSize + at: address]]. + self checkSegments. - at: address]].. manager checkFreeSpace! Item was changed: ----- Method: SpurSegmentManager>>prepareForSnapshot (in category 'snapshot') ----- prepareForSnapshot "shorten all segments by any trailing free space." <inline: false> <var: #seg type: #'SpurSegmentInfo *'> + self checkSegments. 0 to: numSegments - 1 do: [:i| (segments at: i) savedSegSize: (segments at: i) segSize; lastFreeObject: nil]. "Ideally finding the lastFreeObject of each segment would be done in some linear pass through the heap. But for now KISS." manager freeTreeNodesDo: [:freeChunk| | node next seg | node := freeChunk. [node ~= 0] whileTrue: [next := manager objectAfter: node limit: manager endOfMemory. (manager isSegmentBridge: next) ifTrue: [seg := self segmentContainingObj: node. seg lastFreeObject: node. node := 0] ifFalse: [node := manager fetchPointer: manager freeChunkNextIndex ofFreeChunk: node]]. freeChunk]. 0 to: numSegments - 1 do: [:i| (segments at: i) lastFreeObject ifNotNil: [:freeChunk| manager detachFreeObject: freeChunk. (segments at: i) segSize: (manager startOfObject: freeChunk) + manager bridgeSize - (segments at: i) segStart. self bridgeFrom: (self addressOf: (segments at: i)) to: (i < (numSegments - 1) ifTrue: [self addressOf: (segments at: i + 1)])]]. "perhaps this should read manager setEndOfMemory: 0; assimilateNewSegment: (segments at: numSegments - 1)" manager setEndOfMemory: (segments at: numSegments - 1) segLimit - manager bridgeSize! Item was added: + ----- Method: StackInterpreterSimulator>>assertValidExecutionPointersAtEachStep (in category 'accessing') ----- + assertValidExecutionPointersAtEachStep + ^assertVEPAES! Item was added: + ----- Method: StackInterpreterSimulator>>assertValidExecutionPointersAtEachStep: (in category 'accessing') ----- + assertValidExecutionPointersAtEachStep: aBoolean + assertVEPAES := aBoolean! Item was changed: + ----- Method: StackInterpreterSimulator>>ioRelinquishProcessorForMicroseconds: (in category 'I/O primitives support') ----- - ----- Method: StackInterpreterSimulator>>ioRelinquishProcessorForMicroseconds: (in category 'I/O primitive support') ----- ioRelinquishProcessorForMicroseconds: microseconds "In the simulator give an indication that we're idling and check for input." Display reverse: (0@0 extent: 16@16). Sensor peekEvent ifNotNil: [self forceInterruptCheck]. Processor activeProcess == Project uiProcess ifTrue: [World doOneCycle]. microseconds >= 1000 ifTrue: [(Delay forMilliseconds: microseconds + 999 // 1000) wait] ifFalse: [Processor yield]. "And increase the byteCount form which the microsecond clock is derived..." byteCount := byteCount + microseconds - 1. self incrementByteCount! Item was changed: ----- Method: StackToRegisterMappingCogit>>genReturnTopFromBlock (in category 'bytecode generators') ----- genReturnTopFromBlock self assert: inBlock. self ssTop popToReg: ReceiverResultReg. self ssPop: 1. needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg]. + backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. self RetN: methodOrBlockNumArgs + 1 * BytesPerWord. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genUpArrowReturn (in category 'bytecode generators') ----- genUpArrowReturn "Generate a method return from within a method or a block. Frameless method activation looks like receiver args sp-> ret pc. Return pops receiver and arguments off the stack. Callee pushes the result." inBlock ifTrue: [self assert: needsFrame. self annotateBytecode: (self CallRT: ceNonLocalReturnTrampoline). ^0]. needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg. + backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. self RetN: methodOrBlockNumArgs + 1 * BytesPerWord] ifFalse: + [backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. + self RetN: ((methodOrBlockNumArgs > self numRegArgs - [self RetN: ((methodOrBlockNumArgs > self numRegArgs "A method with an interpreter prim will push its register args for the prim. If the failure body is frameless the args must still be popped, see e.g. Behavior>>nextInstance." or: [regArgsHaveBeenPushed]) ifTrue: [methodOrBlockNumArgs + 1 * BytesPerWord] ifFalse: [0])]. ^0!

1 0

Shutting down my svn server for the night
by gettimothy 29 May '14

29 May '14

Hi All, FYI I posted a link to the SVN stuff for the new build tree. I shut down my computer at night, so it will be gone until the a.m. cheers. tty

1 0

Re: [squeak-dev] A UTC based implementation of DateAndTime
by J. Vuletich (mail lists) 29 May '14

29 May '14

Quoting "David T. Lewis" <lewis(a)mail.msen.com>: > ... >> > > Ian did a build of the Windows VM that should have the necessary support. Try > the Squeak4.1.2.2612 VM from http://squeakvm.org/win32/. That VM fails for <primitive: 'primitiveUtcWithOffset'> <primitive: 240> primUtcMicrosecondClock <primitive: 241> primLocalMicrosecondClock > One thing to note - if the primitive is not present, DateAndTime will fall > back on the old logic, and it should produce reasonable results. Yes, Cuis already does that... I'd prefer to be able to assume that any future VM will provide <primitive: 'primitiveUtcWithOffset'> and clean the code. Would that asking for too much? >> Additionally, besides getting rid of <primitive: 137> >> (primLocalSecondsClock that will overflow in 2037), it would be great >> to stop using <primitive: 135> (primLocalSecondsClock), that overflows >> every six days. But for this, we would need a new <primitive: 136> >> (primSignal:atMilliseconds:) as it uses on the same time base. This >> would enable a serious simplification of Delay. >> > > I think that Eliot is planning to update Squeak to use the microsecond clock > primitive, which removes any 2037 issues. I'm not sure if that would include > a change to primSignal:atMilliseconds: > > Dave I see. But given that the Delay code is fragile and not trivial at all, the advantages of of relying on a clock that never rolls over would be significant. Please, Eliot, consider this when you work on this code. Cheers, Juan Vuletich

3 3

Initial flattened oscogvm skeleton in place here: http://www.menmachinesmaterials.com/Flat/
by gettimothy 28 May '14

28 May '14

Hi Eliot. Just directories and a touched HowToBuild file to start. http://www.menmachinesmaterials.com/Flat/ Next I will work on porting existing builds into this new structure. Give me a yell if something is not right. Do we want a top-level README? thx. tty

1 0

[commit][2932] CogVM source as per VMMaker.oscog-eem.734
by commits＠squeakvm.org 28 May '14

28 May '14

Revision: 2932 Author: eliot Date: 2014-05-28 08:19:56 -0700 (Wed, 28 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.734 Spur: Fix bug in sortedFreeListPairwiseReverseDo:. Post block evaluation, free cannot be relied upon, so reconstruct the position in the enumeration from prevPrevFree and prevFree before moving on. Cogit: Make sure genMethodAbortTrampolineFor: has the same linkRegister code as genMethodAbortTrampoline. VMMaker: Add Timothy's CMake VMMaker build scripts to the image directory. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Added Paths: ----------- branches/Cog/image/BuildSqueak46CMakeImage.st branches/Cog/image/BuildSqueak46TrunkCMakeImage.st branches/Cog/image/BuildSqueakStandardImage.st branches/Cog/image/CMakeVMMakerSqueak.text branches/Cog/image/README branches/Cog/image/README.buildsqueakcmakeimage branches/Cog/image/VMMakerTool.text branches/Cog/image/buildsqueakcmakeimage.sh branches/Cog/image/vmm_stack_unix_max.config branches/Cog/image/vmm_stack_unix_min.config branches/Cog/image/vmm_standard_unix_max.config branches/Cog/image/vmm_standard_unix_min.config Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Added: branches/Cog/image/BuildSqueak46CMakeImage.st =================================================================== --- branches/Cog/image/BuildSqueak46CMakeImage.st (rev 0) +++ branches/Cog/image/BuildSqueak46CMakeImage.st 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,69 @@ +| manifest load | +Scanner prefAllowUnderscoreSelectors: true. + +manifest := #( ('http://source.squeak.org/FFI' 1 ('FFI-Pools' 'FFI-Kernel')) + ('http://source.squeak.org/VMMaker' 6 ('Balloon-Engine-Pools' 'VMMaker.oscog' 'Cog' 'CogTools' 'ImageFormat' 'CMakeVMMaker' 'CMakeVMMakerSqueak')) + ('http://ss3.gemstone.com/ss/MethodMassage' 3 ('MethodMassage' 'MethodMassageCompatibility')) + ('http://www.squeaksource.com/AioPlugin' 7 ('VMConstruction-Plugins-AioPlugin')) + ('http://www.squeaksource.com/Alien' 0 ('Alien')) + "('http://www.squeaksource.com/FreeTypePlus' 5 ('FreeType')) can't load this. it is toxic to Squeak 4.5" + ('http://ss3.gemstone.com/ss/FreeTypePlus' 5 ('FreeTypeConstants' 'FreeType' 'FreeTypeTests')) + ('http://www.squeaksource.com/FreetypePlugin' 8 ('Freetype-Plugin')) + ('http://www.squeaksource.com/OSProcess' 4 ('OSProcess')) + ('http://www.squeaksource.com/OSProcessPlugin' 9 ('VMConstruction-Plugins-OSProcessPlugin.oscog')) + ('http://www.squeaksource.com/rb' 5 ('AST-Core' 'AST-Semantic' 'AST-Tests-Core' 'AST-Tests-Semantic' 'Refactoring-Changes' 'Refactoring-Core' 'Refactoring-Environment' 'Refactoring-Tests-Changes' 'Refactoring-Tests-Core' 'Refactoring-Tests-Environment')) + ('http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' ))). + +load := (manifest collect: + [:tuple| + [:path :order :packages| | repository | + repository := MCHttpRepository + location: path + user: 'squeak' + password: 'squeak'. + MCRepositoryGroup default addRepository: repository. + {repository. order. packages}] valueWithArguments: tuple]) + sort: [:a :b| a second <= b second]. + +#( 'FT2Constants.st' + 'Object-performwithwithwithwithwith.st' + 'CompiledMethod-usesAlternateBytecodeSet.st' + 'FileDirectory-on-methods.st' + ) do: + [:fileName| (FileDirectory default fileNamed: fileName) fileIn]. + +World findATranscript: nil. + +load do: + [:tuple| + [:repository :order :packages| + packages do: + [:package| | latestVersion | + latestVersion := (repository versionNamesForPackageNamed: package) first. + [| version | + version := ((MCCacheRepository default includesVersionNamed: latestVersion) + ifTrue: [MCCacheRepository default] + ifFalse: [repository]) versionNamed: latestVersion. + version load. + version workingCopy repositoryGroup addRepository: repository] + on: Warning + do: [:ex| + (ex messageText beginsWith: 'This package depends on the following classes') ifFalse: + [ex pass]. + ex resume]]] + valueWithArguments: tuple]. + + +VMMakerTool openInWorld. +#( 'Workspace' 'VM Simulation Workspace' 'Slang Test Workspace' 'CMakeVMMakerSqueak') reverse do: + [:textFileName| + (StringHolder new contents: (FileDirectory default fileNamed: textFileName, '.text') contentsOfEntireFile) + openLabel: textFileName]. + +(Utilities classPool at: #CommonRequestStrings) ifNotNil: + [:crs| + crs contents: crs contents, '\-\VMMaker generateConfiguration\VMMaker generateAllConfigurationsUnderVersionControl\VMClass openCogMultiWindowBrowser\VMClass openObjectMemoriesInterpretersBrowser' withCRs]. + +CodeHolder useMultiWindowBrowsers: true. + +Smalltalk snapshot: true andQuit: true Added: branches/Cog/image/BuildSqueak46TrunkCMakeImage.st =================================================================== --- branches/Cog/image/BuildSqueak46TrunkCMakeImage.st (rev 0) +++ branches/Cog/image/BuildSqueak46TrunkCMakeImage.st 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,7 @@ +"Change the update stream to trunk, update, then build as per 4.5" +[MCMcmUpdater + defaultUpdateURL: 'http://source.squeak.org/trunk'; + updateFromServer] valueSupplyingAnswer: true. + +"don't use fileIn; it causes an error when the saved image is started" +Compiler evaluate: (FileStream oldFileNamed: 'BuildSqueak46CMakeImage.st') contentsOfEntireFile Added: branches/Cog/image/BuildSqueakStandardImage.st =================================================================== --- branches/Cog/image/BuildSqueakStandardImage.st (rev 0) +++ branches/Cog/image/BuildSqueakStandardImage.st 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,57 @@ +| manifest load | +manifest := #(('http://source.squeak.org/VMMaker' 1 ( 'update'))). + +load := (manifest collect: + [:tuple| + [:path :order :packages| | repository | + repository := MCHttpRepository + location: path + user: 'squeak' + password: 'squeak'. + MCRepositoryGroup default addRepository: repository. + {repository. order. packages}] valueWithArguments: tuple]) + sort: [:a :b| a second <= b second]. + +#( 'FT2Constants.st' + 'Object-performwithwithwithwithwith.st' + 'CompiledMethod-usesAlternateBytecodeSet.st' + 'FileDirectory-on-methods.st' + ) do: + [:fileName| (FileDirectory default fileNamed: fileName) fileIn]. + + + +load do: + [:tuple| + [:repository :order :packages| + packages do: + [:package| | latestVersion | + latestVersion := (repository versionNamesForPackageNamed: package) first. + [| version | + version := ((MCCacheRepository default includesVersionNamed: latestVersion) + ifTrue: [MCCacheRepository default] + ifFalse: [repository]) versionNamed: latestVersion. + version load. + ] + on: Warning + do: [:ex| + (ex messageText beginsWith: 'This package depends on the following classes') ifFalse: + [ex pass]. + ex resume]]] + valueWithArguments: tuple]. + +World findATranscript: nil. +VMMakerTool openInWorld. + +#( 'VMMakerTool') reverse do: + [:textFileName| + (StringHolder new contents: (FileDirectory default fileNamed: textFileName, '.text') contentsOfEntireFile) + openLabel: textFileName]. + +(Utilities classPool at: #CommonRequestStrings) ifNotNil: + [:crs| + crs contents: crs contents, '\-\VMMaker generateConfiguration\VMMaker generateAllConfigurationsUnderVersionControl\VMClass openCogMultiWindowBrowser\VMClass openObjectMemoriesInterpretersBrowser' withCRs]. + +CodeHolder useMultiWindowBrowsers: true. + +Smalltalk snapshot: true andQuit: true Added: branches/Cog/image/CMakeVMMakerSqueak.text =================================================================== --- branches/Cog/image/CMakeVMMakerSqueak.text (rev 0) +++ branches/Cog/image/CMakeVMMakerSqueak.text 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,118 @@ +-------------------------Cog VM Configurations using a builder------------------------- + +SqueakCogMTBuilder buildUnix32. +SqueakCogMTBuilder buildMacOSX32. +SqueakCogMTBuilder buildWin32 + + +-------------------------Cog VM Configurations------------------------- + +SqueakCogMTUnixConfig generateWithSources. +SqueakCogMTUnixConfig generate. + +SqueakCogOnDebian64Config generateWithSources +SqueakCogOnDebian64Config generate + +SqueakCogUnixDebugConfig generateWithSources +SqueakCogUnixDebugConfig generate + +SqueakCogUnixNoGLConfig generateWithSources. +SqueakCogUnixNoGLConfig generate + + +-------------------------Stack VM Configurations using a builder------------------------- +SqueakStackVMBuilder buildSlackwareUnix64w32Libs +SqueakStackVMBuilder buildSlackwareUnix64w32LibsNoGL + + +-------------------------Stack VM configurations------------------------- +SqueakStackCrossRaspbianConfig generateWithSources +SqueakStackCrossRaspbianConfig generate + +SqueakStackRaspbianFastBltConfig generateWithSources +SqueakStackCrossRaspbianFastBltConfig generate + + +SqueakStackRaspbianConfig generateWithSources +SqueakStackRaspbianConfig generate + + +SqueakStackRaspbianFastBltConfig generateWithSources +SqueakStackRaspbianFastBltConfig generate + + +SqueakStackUnixDebugConfig generateWithSources +SqueakStackUnixDebugConfig generate + +SqueakStackEvtAndroidConfig generate "" + + +-------------------------BSD configs------------------------- +SqueakCogFreeBSDConfig generateWithSources + + +-------------------------SunOS configs------------------------- +SqueakCogFreeBSDConfig generateWithSources + + + +-------------------------MacOS Configurations------------------------- + +SqueakCogMacOSConfig generateWithSources. +SqueakCogMacOSConfig generate. + +SqueakCogMacOSDebugConfig generateWithSources. +SqueakCogMacOSDebugConfig generate. + + +SqueakCogMTMacOSConfig generateWithSources. +SqueakCogMTMacOSConfig generate. + + +SqueakStackMacOSConfig generateWithSources. +SqueakStackMacOSConfig generate. + + +SqueakStackMacOSDebugConfig generateWithSources. +SqueakStackMacOSDebugConfig generate. + + +-------------------------IOS Configurations------------------------- + + +SqueakCogCocoaIOSConfig generateWithSources +SqueakCogCocoaIOSConfig generate + +SqueakCogMTCocoaIOSConfig generateWithSources +SqueakCogMTCocoaIOSConfig generate + + +SqueakStackCocoaIOSConfig generateWithSources +SqueakStackCocoaIOSConfig generate + + +SqueakStackCocoaIOSCLANGConfig generateWithSources +SqueakStackCocoaIOSCLANGConfig generate + +SqueakStackIPhoneConfig generateWithSources +SqueakStackIPhoneConfig generate + + +SqueakStackIPhoneSimulatorConfig generateWithSources +SqueakStackIPhoneSimulatorConfig generate + +-------------------------Windows configs------------------------- +SqueakCogWindowsConfig generateWithSources +SqueakCogWindowsConfig generate. + + +SqueakCogMTWindowsConfig generateWithSources +SqueakCogMTWindowsConfig generate + + +SqueakCogWindowsDebugConfig generateWithSources. +SqueakCogWindowsDebugConfig generate. + +SqueakStackWindowsConfig generateWithSources +SqueakStackWindowsConfig generate + Added: branches/Cog/image/README =================================================================== --- branches/Cog/image/README (rev 0) +++ branches/Cog/image/README 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,7 @@ +This directory contains scripts that can buld various VMMaker images. +The standard Cog VMMaker image is built loading the latest VMMaker.oscog and Cog +packages, plus support packages, into an updated Squeak trunk image. +You can build this image using buildsqueaktrunkimage.sh. +Once you start-up the image various workspaces contain useful expressions to +run the simulator, test slang output and so on. The "do..." menu off the main +screen menu also contains expressions to generate VM sources. Added: branches/Cog/image/README.buildsqueakcmakeimage =================================================================== --- branches/Cog/image/README.buildsqueakcmakeimage (rev 0) +++ branches/Cog/image/README.buildsqueakcmakeimage 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,47 @@ +buildsqueakcmakeimage.sh is a newbie friendly script that downloads and configures either a Cog VMMaker image or a StandardVMMaker image that is completely configured for the end user to get productive quickly. +While the image is set up for CMake, the existing GNU build infrastructure is maintained. + +If by chance you have not already done so, + +svn co http://www.squeakvm.org/svn/squeak/branches/Cog will download the source tree containing this file; it exists as Cog/image/README.buildsqueakcmakimage + +Requirements to run the script are: + +svn +wget +zip +rsync + + +From withing the COG/image directory run buildsqueakcmakeimage.sh (buildsqueakcmakeimage.sh -h for usage) + +For Cog installation, the script then + downloads the appropriate squeak platform and creates CogVMMaker.image/changes and StandardVMMaker.image/changes for the Cog and Standard Interpreter respectively + installs the necessary Smalltalk classes on both images. + rsyncs the parent Cog directory as a sub-tree of the Squeak installation for use by CogVMMaker.image to an appropriate subdirectory for the version of Squeak. + The rsynced copy of the Cog svn source is then populated with a parallel cmake_xyzbuild tree where the cmake build artifacts are installed (without breaking the existing gnu build stuff) + + +To view/run your cog build system change directory to Cog/image/cogVMMaker/Squeak---.app/ and run squeakCogVMMaker.sh +The source and build directories are in Cog/image/cogVMMaker/Squeak---.app/Contents/Resources/oscogvm/ +The cmake specific build directories are created by the script and are prefaces with 'cmake_'. This was done to avoid cluttering the existing GNU build system. +After generating your build, change directory to your build directory (example: cd oscogvm/cmake_stackbuild/unixbuild/bld/) and invoke build.sh to launch cmake. + +After compilation, output files are stored in oscogvm/results + + + + +When the Standard Interpreter, no special build tree is created. The system is just set up for use as-is described at http://wiki.squeak.org/squeak/6177 +to view/run your standard build system cd to Cog/image/standardVMMaker/ + + + + + + + + + + + Added: branches/Cog/image/VMMakerTool.text =================================================================== --- branches/Cog/image/VMMakerTool.text (rev 0) +++ branches/Cog/image/VMMakerTool.text 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,19 @@ +This image encapsulates the steps required to set up a StandardVMMaker image as described here: http://wiki.squeak.org/squeak/6177 + +Step 1. Generate the sources using VMMakerTool. + + In the big green window labeled VMMaker click the load button. + In the file selector, look for *.config files (example vm_standard_PLATFORM_min.config) this will configure the tool for that configuration. + Next to the 'Generate' Label, click the 'Entire' button to generate the sources. + (N.B. VMMakerTool is a front-end to VMMaker. As you gain experience, you will probably find it easier to utilize scripts rather than the GUI) + Read the class comments for more info: VMMakerTool browse + + +Step 2. compile the sources + Exit Squeak and create install directory, configure,make,make-install + cd ~/..Cog/image/standardVMMaker/Squeak-4.5-All-in-One.app/Contents/Resources/build + ../platforms/unix/cmake/configure –help + mkdir ~/where/I/want/the/new/vm/executable/to/be/installed, your path is your preference used in –prefix= below + ../platforms/unix/cmake/configure --prefix=~/usr/local/standardVM32/ --src=../trunk/src/ --without-gl + make + make install Added: branches/Cog/image/buildsqueakcmakeimage.sh =================================================================== --- branches/Cog/image/buildsqueakcmakeimage.sh (rev 0) +++ branches/Cog/image/buildsqueakcmakeimage.sh 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,501 @@ +#!/bin/bash -x + +# Author tty. +# 2014-05-01 +# This script downloads and configur +#Overview of script flow assuming version 4.5 +# parse options +# case statement on -v option +# clean_source_tree (not used until migration to cmake is complete and GNU-B-GONE +# create_cmake_source_tree +# get_four_five +# launch_and_configure_four_five +# run_four_five +# +# 4.6 follows same flow. +# adding new versions should be evident + + + +#begin function declarations + +show_help() { +cat << EOF +Usage: ${0##*/} [-b] [-h] [-s VERSION] [-t TRUNK] [-v VERSION] +Download and configure a Squeak image configured for Cog and/or Standard VM building. load either stable or trunk classes. + + -b Both Cog Interpreter configuration and Standard Interpreter configuration on latest stable branch + -c VERSION Cog Interpreter configuration on squeak VERSION + -h display this help and exit + -s VERSION Standard Interpreter configuration on squeak VERSION + -t Monticello source is trunk (2014-05-05 only 4.5 supported and is ignored otherwise) + + + +Example: ./buildsqueakcmakeimage -b (configure BOTH Squeak 4.6 for CMake VMMaker.oscog and configure an additional Standard Intepreter VMMaker on 4.6) + ./buildsqueakcmakeimage -c 4.5 (configure Squeak 4.5 for CMake VMMaker.oscog) + ./buildsqueakcmakeimage -c 4.5 -t (configure Squeak 4.5 for CMake VMMaker.oscog. Monticello source is trunk) + ./buildsqueakcmakeimage -c 4.6 (configure Squeak 4.6 for CMake VMMaker.oscog) + ./buildsqueakcmakeimage -s 4.5 (configure Squeak 4.5 for CMake VMMaker) + ./buildsqueakcmakeimage -s 4.6 (configure Squeak 4.6 for CMake VMMaker) + ./buildsqueakcmakeimage -c 4.6 -s (same as cmakeify -b ) + +SEE: README.buildsqueakcmakeimage for details of this script. +EOF + +} + +check_required(){ + wget --help >/dev/null || (echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2; exit 1) + unzip --help >/dev/null || (echo 'could not find unzip. you can find instructions on how to install it on google.' 1>&2; exit 1) + rsync --help >/dev/null || (echo 'could not find rsync. you can find instructions on how to install it on google.' 1>&2; exit 1) + sed --help >/dev/null || (echo 'could not find sed. you can find instructions on how to install it on google.' 1>&2; exit 1) +} + +#create a parallel build tree for cmake +create_cmake_source_tree(){ + + echo $1 + cd $1 + cp -Rv cygwinbuild cmake_cygwinbuild + cp -Rv macbuild cmake_macbuild + cp -Rv nsbuild cmake_nsbuild + cp -Rv nscogbuild cmake_nscogbuild + cp -Rv nsspurcogbuild cmake_nsspurcogbuild + cp -Rv nsspurstackbuild cmake_nsspurstackbuild + cp -Rv sistamacbuild cmake_sistamacbuild + cp -Rv spurcogbuild cmake_spurcogbuild + cp -Rv spursistamacbuild cmake_spursistamacbuild + cp -Rv spurstackbuild cmake_spurstackbuild + cp -Rv stackbuild cmake_stackbuild + cp -Rv unixbuild cmake_unixbuild + + find ./cmake_* -type f -name "mvm" -exec rm -f {} \; + find ./cmake_* -type f -name "HowToBuild" -exec rm -f {} \; + + cd - +} + +clean_source_tree(){ +echo $1 + cd $1 + + find ./ -type f -name "ChangeLog" -exec rm -f {} \; + find ./ -type f -name "Makefile*" -exec rm -f {} \; + find ./ -type f -name "*README *" -exec rm -f {} \; + find ./ -type f -name "make*" -exec rm -f {} \; + find ./ -type f -name "mk*" -exec rm -f {} \; + find ./ -type f -name "mvm" -exec rm -f {} \; + find ./ -type f -name "plugins.int" -exec rm -f {} \; + find ./ -type f -name "plugins.ext" -exec rm -f {} \; + find ./ -type f -name "examplePlugins.*" -exec rm -f {} \; + find ./ -type f -name "HowToBuild" -exec rm -f {} \; + + find ./ -type f -name "*.bat" -exec rm -f {} \; + find ./ -type f -name "*.~" -exec rm -f {} \; + find ./ -type f -name "*.config" -exec rm -f {} \; + find ./ -type f -name "*.gz" -exec rm -f {} \; + find ./ -type f -name "*.in" -exec rm -f {} \; + find ./ -type f -name "*.lproj" -exec rm -f {} \; + find ./ -type f -name "*.manifest" -exec rm -f {} \; + find ./ -type f -name "*.pch" -exec rm -f {} \; + find ./ -type f -name "*.rc" -exec rm -f {} \; + find ./ -type f $ -iname "*.sh" ! -iname "buildsqueaktrunkimage.sh" $ -exec rm -f {} \; #rm .sh files except this one! (: + find ./ -type d -name "*.xcodeproj" -exec rm -Rf {} \; + find ./ -type d -name "*.lproj" -exec rm -Rf {} \; +echo $1 + cd - +} + +fourty_two(){ +echo 'Answer to the Ultimate Question of Life, the Universe, and Everything' +exit +} + + +get_four_five(){ + + cd $COGINSTALLDIRECTORY + + check_required + + wget -c http://ftp.squeak.org/4.5/$SQUEAK45ZIP +# cp ~/$SQUEAK45ZIP ./ #<--script development timesaver. do a copy instead of a wget + unzip $SQUEAK45ZIP + rm $SQUEAK45ZIP + + + cp -p $SQUEAK45.image $SQUEAK45RESOURCES/CogVMMaker.image + cp -p $SQUEAK45.changes $SQUEAK45RESOURCES/CogVMMaker.changes + + cd - +} + +launch_and_configure_four_five(){ #copy-n-paste-n-mangle from Bert's squeak.sh + + case $OS in + BSD) SQUEAK45VM="$COGINSTALLDIRECTORY/$SQUEAK45APP/Contents/MacOS/Squeak";; + Darwin) SQUEAK45VM="$COGINSTALLDIRECTORY/$SQUEAK45APP/Contents/MacOS/Squeak";; + SOLARIS*) SQUEAK45VM="$COGINSTALLDIRECTORY/$SQUEAK45APP/Contents/MacOS/Squeak";; + CYGWIN*) SQUEAK45VM="$COGINSTALLDIRECTORY/$SQUEAK45APP/SqueakConsole.exe";; + Linux) if [ "$CPU" = x86_64 ]; then + CPU=i686 + echo Running 32-bit Squeak on a 64-bit System. Hope the 32-bit runtime libraries are installed ... + fi + SQUEAK45VM="$COGINSTALLDIRECTORY/$SQUEAK45APP/Contents/$OS-$CPU/bin/squeak";; + *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 + esac + + if [ "$TRUNK" = true ]; then + SCRIPT="$APP/BuildSqueak45TrunkCMakeImage.st" + else + SCRIPT="$APP/BuildSqueak45CMakeImage.st" + fi + + if [ "$CPU" = x86_64 ] ; then + CPU=i686 + fi + + showerror() { + if [ -n "$DISPLAY" -a -x "`which kdialog 2>/dev/null`" ]; then + kdialog --error "$1" + elif [ -n "$DISPLAY" -a -x "`which zenity 2>/dev/null`" ]; then + zenity --error --text "$1" + else + dialog --msgbox "$1" 0 0 + fi + } + + if [ ! -x "$SQUEAK45VM" ] ; then + if [ ! -r "$SQUEAK45VM" ] ; then + showerror "This Squeak version does not support $OS-$CPU" + else + showerror "Squeak does not have permissions to execute" + fi + fi + + + rsync -av --progress ../* $COGINSTALLDIRECTORY/$SQUEAK45RESOURCES/oscogvm --exclude $PWD #copy Cog source tree (minus this directory) to standard dir and remove GNU build artefacts + + cd $COGINSTALLDIRECTORY/$SQUEAK45RESOURCES + ln -s oscogvm/platforms platforms #<--needed for VMMakerTool + cd - + +# clean_source_tree $COGINSTALLDIRECTORY/$SQUEAK45RESOURCES/oscogvm + create_cmake_source_tree $COGINSTALLDIRECTORY/$SQUEAK45RESOURCES/oscogvm + + cp $COGINSTALLDIRECTORY/$SQUEAK45APP/squeak.sh $COGINSTALLDIRECTORY/$SQUEAK45APP/squeakCogVMMaker.sh #create a shell script that launches our CogVMMaker.image + sed -i -e "s/$SQUEAK45IMAGE/$COGIMAGE/g" $COGINSTALLDIRECTORY/$SQUEAK45APP/squeakCogVMMaker.sh + + + cp -p *.text $COGINSTALLDIRECTORY/$SQUEAK45RESOURCES #Workspaces with helpful text + cp -p *.config $COGINSTALLDIRECTORY/$SQUEAK45RESOURCES #VMMakerTool configuration files + cp -p *.st $COGINSTALLDIRECTORY/$SQUEAK45RESOURCES #Smalltalk + + "$SQUEAK45VM" "$COGINSTALLDIRECTORY/$SQUEAK45RESOURCES/$COGIMAGE" "$SCRIPT" + +} + +get_four_five_standard_vm(){ + + + cd $STANDARDINSTALLDIRECTORY + + check_required + + if [ -d ../$COGINSTALLDIRECTORY ]; then # if it exists copy the cog stuff over for reuse and clean it up otherwise downaload via svn + cp -R ../$COGINSTALLDIRECTORY/$SQUEAK45APP ./ + rm -f $SQUEAK45RESOURCES/CogVMMaker.* + rm -Rf $SQUEAK45RESOURCES/platforms + rm -Rf $SQUEAK45RESOURCES/oscogvm + else + wget -c http://ftp.squeak.org/4.5/$SQUEAK45ZIP + unzip $SQUEAK45ZIP + rm $SQUEAK45ZIP + fi + + cp -p $SQUEAK45.image $SQUEAK45RESOURCES/StandardVMMaker.image + cp -p $SQUEAK45.changes $SQUEAK45RESOURCES/StandardVMMaker.changes + +# cp -R ~/trunk $SQUEAK45RESOURCES #<--script development timesaver. use cp instead of svn + svn co http://squeakvm.org/svn/squeak/trunk $SQUEAK45RESOURCES/trunk + + if [ -h $SQUEAK45RESOURCES/platforms ]; then + rm -f $SQUEAK45RESOURCES/platforms + fi + cd $SQUEAK45RESOURCES + ln -s trunk/platforms platforms #<--needed for VMMakerTool + mkdir build + cd - + + cd ../ + +} + +launch_and_configure_four_five_standard(){ +#echo 'http://wiki.squeak.org/squeak/6177' + case $OS in + BSD) SQUEAK45VM="$STANDARDINSTALLDIRECTORY/$SQUEAK45APP/Contents/MacOS/Squeak";; + Darwin) SQUEAK45VM="$STANDARDINSTALLDIRECTORY/$SQUEAK45APP/Contents/MacOS/Squeak";; + SOLARIS*) SQUEAK45VM="$STANDARDINSTALLDIRECTORY/$SQUEAK45APP/Contents/MacOS/Squeak";; + CYGWIN*) SQUEAK45VM="$STANDARDINSTALLDIRECTORY/$SQUEAK45APP/SqueakConsole.exe";; + Linux) if [ "$CPU" = x86_64 ]; then + CPU=i686 + echo Running 32-bit Squeak on a 64-bit System. Hope the 32-bit runtime libraries are installed ... + fi + SQUEAK45VM="$STANDARDINSTALLDIRECTORY/$SQUEAK45APP/Contents/$OS-$CPU/bin/squeak";; + *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 + esac + SCRIPT="$APP/BuildSqueakStandardImage.st" + + + cp $STANDARDINSTALLDIRECTORY/$SQUEAK45APP/squeak.sh $STANDARDINSTALLDIRECTORY/$SQUEAK45APP/squeakStandardVMMaker.sh #create a shell script that launches our CogVMMaker.image + sed -i -e "s/$SQUEAK45IMAGE/$STANDARDIMAGE/g" $STANDARDINSTALLDIRECTORY/$SQUEAK45APP/squeakStandardVMMaker.sh + + rm -f $STANDARDINSTALLDIRECTORY/$SQUEAK45APP/squeakCogVMMaker.sh #if we copied Squeak from the cogVMMaker directory, remove the cog launch script + + + cp -p *.text $STANDARDINSTALLDIRECTORY/$SQUEAK45RESOURCES #Workspaces with helpful text + cp -p *.config $STANDARDINSTALLDIRECTORY/$SQUEAK45RESOURCES #VMMakerTool configuration files + cp -p BuildSqueakStandardImage.st $STANDARDINSTALLDIRECTORY/$SQUEAK45RESOURCES #Smalltalk + + "$SQUEAK45VM" "$STANDARDINSTALLDIRECTORY/$SQUEAK45RESOURCES/$STANDARDIMAGE" "$SCRIPT" + +} +## 4.6 is not an all-in-one as of 2014-04-30 therefore, we need a cog vm +get_four_six(){ + + cd $COGINSTALLDIRECTORY + + check_required + + case $OS in #TODO windows mac etc + Linux) + + wget -c http://www.mirandabanda.org/files/Cog/VM/VM.r2776/coglinux-13.33.2776.tgz #TODO <--do I need to generalize this? + tar -xf coglinux-13.33.2776.tgz + rm -f coglinux-13.33.2776.tgz + + wget -c ftp.squeak.org/4.6alpha/$SQUEAK46ZIP + unzip $SQUEAK46ZIP -d $COGLINUX + rm $SQUEAK46ZIP + + cd $COGLINUX + cp -p $SQUEAK46.image CogVMMaker.image + cp -p $SQUEAK46.changes CogVMMaker.changes + + cd ../ + + ;; + *) echo "No Cog found. bailing out." 1>&2; exit 2 + esac + + cd ../ +} + + +launch_and_configure_four_six(){ + + cp -p BuildSqueak46CMake* $COGINSTALLDIRECTORY/coglinux + cp -p *.text $COGINSTALLDIRECTORY/coglinux + cp -p *.config $COGINSTALLDIRECTORY/coglinux + + rsync -avq --progress ../* $COGINSTALLDIRECTORY/coglinux/oscogvm --exclude $PWD #copy Cog source tree (minus this directory) to standard dir and remove GNU build artefacts + +# clean_source_tree $COGINSTALLDIRECTORY/$SQUEAK45RESOURCES/oscogvm + create_cmake_source_tree $COGINSTALLDIRECTORY/$COGLINUX/oscogvm + + + cd $COGINSTALLDIRECTORY/$COGLINUX + ln -s oscogvm/platforms platforms #<--needed for VMMakerTool + ./squeak CogVMMaker.image BuildSqueak46CMakeImage.st + cd - + + cd ../ +} + + +get_four_six_standard_vm(){ + + + + cd $STANDARDINSTALLDIRECTORY + + check_required + + if [ -d ../$COGINSTALLDIRECTORY ]; then # if it exists copy the cog stuff over for reuse and clean it up otherwise downaload via svn + cp -R ../$COGINSTALLDIRECTORY/$COGLINUX ./ + rm -f $COGLINUX/CogVMMaker.* + rm -f $COGLINUX/squeakCogVMMaker.sh + rm -Rf $COGLINUX/oscogvm + else + wget -c http://www.mirandabanda.org/files/Cog/VM/VM.r2776/coglinux-13.33.2776.tgz #TODO <--do I need to generalize this? + tar -xf coglinux-13.33.2776.tgz + rm -f coglinux-13.33.2776.tgz + + wget -c ftp.squeak.org/4.6alpha/$SQUEAK46ZIP + unzip $SQUEAK46ZIP -d $COGLINUX + rm $SQUEAK46ZIP + + cd $COGLINUX + cp -p $SQUEAK46.image StandardVMMaker.image + cp -p $SQUEAK46.changes StandardVMMaker.changes + cd ../ + fi + + +# cp -R ~/trunk $COGLINUX #<--script development timesaver. use cp instead of svn + svn co http://squeakvm.org/svn/squeak/trunk $COGLINUX/trunk + + if [ -h $COGLINUX/platforms ]; then + rm -f $COGLINUX/platforms + fi + cd $COGLINUX + ln -s trunk/platforms platforms #<--needed for VMMakerTool + mkdir build + cd - + + cd ../ + +} + +launch_and_configure_four_six_standard(){ +#echo 'http://wiki.squeak.org/squeak/6177' + + + cp -p BuildSqueakStandardImage.st $STANDARDINSTALLDIRECTORY/$COGLINUX + cp -p *.text $STANDARDINSTALLDIRECTORY/$COGLINUX + cp -p *.config $STANDARDINSTALLDIRECTORY/$COGLINUX + cd $STANDARDINSTALLDIRECTORY/$COGLINUX + ./squeak StandardVMMaker.image BuildSqueakStandardImage.st + cd - +} + + +#end function declarations +#begin script proper + +# initialize variables: + +#Flow Control Variables +APP=`dirname "$0"` +APP=`cd "$APP";pwd` +OS=`uname -s` +CPU=`uname -m` +COG=false #include cog configuration +STANDARD=false #include standard configuration +TRUNK=false #build from trunk +VERSION=4.6 +NO_ARGS=0 +E_OPTERROR=85 + +#Squeak 4.5 specific variables +SQUEAK45ZIP=Squeak-4.5-All-in-One.zip +SQUEAK45APP=Squeak-4.5-All-in-One.app +SQUEAK45RESOURCES=$SQUEAK45APP/Contents/Resources +SQUEAK45=$SQUEAK45RESOURCES/Squeak4.5-13680 +SQUEAK45IMAGE="Squeak4.5-13680.image" +SQUEAK45VM="DETERMINED IN launch_and_configure_four_five()" + +#Squeak 4.6 specific variables +SQUEAK46=Squeak4.6-13700 +SQUEAK46ZIP=$SQUEAK46.zip +COGLINUX=coglinux + +#Squeak Common variables +COGIMAGE="CogVMMaker.image" +STANDARDIMAGE="StandardVMMaker.image" +COGINSTALLDIRECTORY="cogVMMaker" #Cog buildsqueakcmakeimage end result lives here +STANDARDINSTALLDIRECTORY="standardVMMaker" #Standard Intepreter buildsqueakcmakeimage end result lives here + + + +if [ $# -eq "$NO_ARGS" ] # Script invoked with no command-line args +then + show_help + exit $E_OPTERROR # Exit and explain usage. +fi + +#parse options +OPTIND=1 +while getopts "bc:hs:t" opt; do + case "$opt" in + b) VERSION=4.5 #latest stable branch + COG=true + STANDARD=true + TRUNK=false + ;; + c) VERSION=$OPTARG + COG=true + ;; + h) + show_help + exit 0 + ;; + s) VERSION=$OPTARG + STANDARD=true + ;; + + t) TRUNK=true + ;; + + '?') +1 show_help >&2 + exit 1 + ;; + esac +done +shift "$((OPTIND-1))" # Shift off the options and optional --. + + + + +##download squeak and launch it with appropriate smalltalk script. +case "$VERSION" in + 4.5) + if [ "$COG" = true ]; then + mkdir $COGINSTALLDIRECTORY + [ "$TRUNK" == true ] && printf 'Loading Squeak version %s and configuring from trunk\n' "$VERSION" || printf 'Loading Squeak version %s\n' "$VERSION" + [ "$TRUNK" == true ] && (get_four_five $TRUNK) || (get_four_five) + launch_and_configure_four_five $TRUNK + printf 'to run CogVMMaker: cd %s; ./squeakCogVMMaker.sh\n' "$COGINSTALLDIRECTORY/$SQUEAK45APP" + fi + + if [ "$STANDARD" = true ]; then + mkdir $STANDARDINSTALLDIRECTORY + get_four_five_standard_vm + launch_and_configure_four_five_standard + printf 'to run StandardVMMaker: cd %s; ./squeakStandardVMMaker.sh\n' "$STANDARDINSTALLDIRECTORY/$SQUEAK45APP" + fi + + [ "$TRUNK" == true ] && (echo 'Squeak 4.5 Trunk installation and configuration complete. ';) || (echo 'Squeak 4.5 installation and configuration complete. ';) + ;; + 4.6) + if [ "$COG" = true ]; then + mkdir $COGINSTALLDIRECTORY + printf 'Loading Squeak version %s\n' "$VERSION" + get_four_six + launch_and_configure_four_six + + printf 'to run CogVMMaker: cd %s; squeak CogVMMaker.image' "$COGINSTALLDIRECTORY/coglinux" + fi + if [ "$STANDARD" = true ]; then + mkdir $STANDARDINSTALLDIRECTORY + get_four_six_standard_vm + launch_and_configure_four_six_standard + printf 'to run StandardVMMaker: cd %s; squeak StandardVMMaker.image' "$STANDARDINSTALLDIRECTORY/coglinux" + fi + echo 'Squeak 4.6 installation and configuration complete. '; + exit + ;; + + 42) + fourty_two; + ;; + *) echo 'version $VERSION not supported. Try 4.5 or 4.6' + exit 2 + ;; + esac + + +exit Property changes on: branches/Cog/image/buildsqueakcmakeimage.sh ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/image/vmm_stack_unix_max.config =================================================================== --- branches/Cog/image/vmm_stack_unix_max.config (rev 0) +++ branches/Cog/image/vmm_stack_unix_max.config 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,50 @@ +#(#(#ADPCMCodecPlugin +#AsynchFilePlugin +#BMPReadWriterPlugin +#CameraPlugin +#CroquetPlugin +#DSAPlugin +#DeflatePlugin +#DropPlugin +#FFIPlugin +#FFTPlugin +#FileCopyPlugin +#FilePlugin +#FloatArrayPlugin +#FloatMathPlugin +#IA32ABIPlugin +#JPEGReadWriter2Plugin +#JPEGReaderPlugin +#JoystickTabletPlugin +#KlattSynthesizerPlugin +#LargeIntegersPlugin +#LocalePlugin +#MIDIPlugin +#Matrix2x3Plugin +#MiscPrimitivePlugin +#Mpeg3Plugin +#RePlugin +#SecurityPlugin +#SerialPlugin +#SocketPlugin +#SoundCodecPlugin +#SoundGenerationPlugin +#SoundPlugin +#SqueakSSLPlugin +#StarSqueakPlugin +#UUIDPlugin +#UnicodePlugin +#UnixAioPlugin +#UnixOSProcessPlugin +) +#() +true +false +'unix' +'oscogvm/stacksrc' +'platforms' +4 +true +true +'StackInterpreter' +) \ No newline at end of file Added: branches/Cog/image/vmm_stack_unix_min.config =================================================================== --- branches/Cog/image/vmm_stack_unix_min.config (rev 0) +++ branches/Cog/image/vmm_stack_unix_min.config 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,19 @@ +#(#(#ADPCMCodecPlugin +#AsynchFilePlugin +#B2DPlugin +# BitBltPlugin \ +#FilePlugin +#MiscPrimitivePlugin +#SocketPlugin +) +#() +true +false +'unix' +'oscogvm/stacksrc' +'platforms' +4 +true +true +'StackInterpreter' +) \ No newline at end of file Added: branches/Cog/image/vmm_standard_unix_max.config =================================================================== --- branches/Cog/image/vmm_standard_unix_max.config (rev 0) +++ branches/Cog/image/vmm_standard_unix_max.config 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,50 @@ +#(#(#ADPCMCodecPlugin +#AsynchFilePlugin +#BMPReadWriterPlugin +#CameraPlugin +#CroquetPlugin +#DSAPlugin +#DeflatePlugin +#DropPlugin +#FFIPlugin +#FFTPlugin +#FileCopyPlugin +#FilePlugin +#FloatArrayPlugin +#FloatMathPlugin +#IA32ABIPlugin +#JPEGReadWriter2Plugin +#JPEGReaderPlugin +#JoystickTabletPlugin +#KlattSynthesizerPlugin +#LargeIntegersPlugin +#LocalePlugin +#MIDIPlugin +#Matrix2x3Plugin +#MiscPrimitivePlugin +#Mpeg3Plugin +#RePlugin +#SecurityPlugin +#SerialPlugin +#SocketPlugin +#SoundCodecPlugin +#SoundGenerationPlugin +#SoundPlugin +#SqueakSSLPlugin +#StarSqueakPlugin +#UUIDPlugin +#UnicodePlugin +#UnixAioPlugin +#UnixOSProcessPlugin +) +#() +true +false +'unix' +'trunk/src' +'platforms' +4 +true +true +'Interpreter' +) \ No newline at end of file Added: branches/Cog/image/vmm_standard_unix_min.config =================================================================== --- branches/Cog/image/vmm_standard_unix_min.config (rev 0) +++ branches/Cog/image/vmm_standard_unix_min.config 2014-05-28 15:19:56 UTC (rev 2932) @@ -0,0 +1,19 @@ +#(#(#ADPCMCodecPlugin +#AsynchFilePlugin +#B2DPlugin +# BitBltPlugin \ +#FilePlugin +#MiscPrimitivePlugin +#SocketPlugin +) +#() +true +false +'unix' +'trunk/src' +'platforms' +4 +true +true +'Interpreter' +) \ No newline at end of file Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-05-26 20:28:22 UTC (rev 2931) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-05-28 15:19:56 UTC (rev 2932) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa from - StackToRegisterMappingCogit VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -13749,6 +13749,7 @@ genoperandoperand(CmpCqR, 0, ReceiverResultReg); /* begin JumpNonZero: */ jumpSICMiss = genoperand(JumpNonZero, ((sqInt)0)); + compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(ceStackOverflow, 1, 1, SendNumArgsReg, null, null, null, 0, null); jmpTarget(jumpSICMiss, gLabel()); genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-05-26 20:28:22 UTC (rev 2931) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-05-28 15:19:56 UTC (rev 2932) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-26 20:28:22 UTC (rev 2931) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-28 15:19:56 UTC (rev 2932) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-05-26 20:28:22 UTC (rev 2931) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-05-28 15:19:56 UTC (rev 2932) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa from - StackToRegisterMappingCogit VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -15040,6 +15040,7 @@ genoperandoperand(CmpCqR, 0, ReceiverResultReg); /* begin JumpNonZero: */ jumpSICMiss = genoperand(JumpNonZero, ((sqInt)0)); + compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(ceStackOverflow, 1, 1, SendNumArgsReg, null, null, null, 0, null); jmpTarget(jumpSICMiss, gLabel()); genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-05-26 20:28:22 UTC (rev 2931) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-05-28 15:19:56 UTC (rev 2932) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-05-26 20:28:22 UTC (rev 2931) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-05-28 15:19:56 UTC (rev 2932) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-05-26 20:28:22 UTC (rev 2931) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-05-28 15:19:56 UTC (rev 2932) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa from - CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CoInterpreter VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1480,9 +1480,9 @@ _iss sqInt rememberedSetSize; _iss unsigned char primTraceLogIndex; _iss SpurContiguousObjStack unscannedEphemerons; -_iss sqInt firstFreeChunk; _iss StackPage * mostRecentlyUsedPage; _iss SpurNewSpaceSpace pastSpace; +_iss sqInt firstFreeChunk; _iss sqInt numStackPages; _iss usqInt newSpaceStart; _iss sqInt classTableFirstPage; @@ -1517,6 +1517,7 @@ _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt backwardJumpCount; +_iss sqInt lastFreeChunk; _iss sqInt metaclassNumSlots; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; @@ -1546,7 +1547,6 @@ _iss sqInt thisClassIndex; _iss sqInt fullScreenFlag; _iss sqInt interruptPending; -_iss sqInt lastFreeChunk; _iss sqInt lastHash; _iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt marking; @@ -2230,7 +2230,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.733"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.734"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -22741,7 +22741,6 @@ sqInt i; sqInt low; sqInt nextFree; - sqInt nextFree1; usqInt numSlots; usqInt numSlots1; sqInt prevFree; @@ -22762,12 +22761,7 @@ free = GIV(lastFreeChunk); prevPrevFree = (prevFree = 0); while (free != 0) { - nextFree = (longAt((free + (BaseHeaderSize)) + (0 << 2))) ^ prevFree; - assert((free == 0) - || (isFreeObject(free))); - assert((prevFree == 0) - || (prevFree > free)); - + ; /* begin addressAfter: */ /* begin numSlotsOfAny: */ numSlots1 = byteAt(free + 7); @@ -22793,31 +22787,25 @@ } } - assert((prevFree == 0) - || (isFreeObject(prevFree))); - assert((prevPrevFree == 0) - || (isFreeObject(prevPrevFree))); - if (!(((longAt(free)) & 0x3FFFFF) == 0)) { - free = (longAt((prevFree + (BaseHeaderSize)) + (0 << 2))) ^ prevPrevFree; + if (prevFree == 0) { + assert(free == GIV(lastFreeChunk)); + prevFree = GIV(lastFreeChunk); + free = (longAt((GIV(lastFreeChunk) + (BaseHeaderSize)) + (0 << 2))) ^ 0; } - if ((nextFree == 0) - || (((longAt(nextFree)) & 0x3FFFFF) == 0)) { - prevPrevFree = prevFree; - prevFree = free; - free = (prevFree == GIV(firstFreeChunk) - ? 0 - : nextFree); - } else { - free = GIV(lastFreeChunk); - prevPrevFree = (prevFree = 0); - while (free > nextFree) { - nextFree = (longAt((free + (BaseHeaderSize)) + (0 << 2))) ^ prevFree; - assert(isFreeObject(nextFree)); + assert(isFreeObject(prevFree)); + if (prevPrevFree == 0) { + assert(free == (nextInSortedFreeListLinkgiven(GIV(lastFreeChunk), 0))); + prevPrevFree = GIV(lastFreeChunk); + prevFree = (longAt((GIV(lastFreeChunk) + (BaseHeaderSize)) + (0 << 2))) ^ 0; + } + else { + assert(isFreeObject(prevPrevFree)); + free = (longAt((prevFree + (BaseHeaderSize)) + (0 << 2))) ^ prevPrevFree; prevPrevFree = prevFree; prevFree = free; - free = nextFree; } + free = (longAt((prevFree + (BaseHeaderSize)) + (0 << 2))) ^ prevPrevFree; } } null; @@ -22830,11 +22818,11 @@ free1 = GIV(firstFreeChunk); prevPrevFree1 = (prevFree1 = 0); while (free1 != 0) { - nextFree1 = (longAt((free1 + (BaseHeaderSize)) + (0 << 2))) ^ prevFree1; + nextFree = (longAt((free1 + (BaseHeaderSize)) + (0 << 2))) ^ prevFree1; assert(isFreeObject(free1)); - assert((nextFree1 == 0) - || ((nextFree1 > free1) - && (isFreeObject(nextFree1)))); + assert((nextFree == 0) + || ((nextFree > free1) + && (isFreeObject(nextFree)))); assert((prevFree1 == 0) || (prevFree1 < free1)); bytes = bytesInObject(free1); @@ -22847,7 +22835,7 @@ prevPrevFree1 = prevFree1; prevFree1 = free1; - free1 = nextFree1; + free1 = nextFree; } /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-05-26 20:28:22 UTC (rev 2931) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-05-28 15:19:56 UTC (rev 2932) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-05-26 20:28:22 UTC (rev 2931) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-05-28 15:19:56 UTC (rev 2932) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa from - CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 + CoInterpreter VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1483,9 +1483,9 @@ _iss sqInt rememberedSetSize; _iss unsigned char primTraceLogIndex; _iss SpurContiguousObjStack unscannedEphemerons; -_iss sqInt firstFreeChunk; _iss StackPage * mostRecentlyUsedPage; _iss SpurNewSpaceSpace pastSpace; +_iss sqInt firstFreeChunk; _iss sqInt numStackPages; _iss usqInt newSpaceStart; _iss sqInt classTableFirstPage; @@ -1520,6 +1520,7 @@ _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt backwardJumpCount; +_iss sqInt lastFreeChunk; _iss sqInt metaclassNumSlots; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; @@ -1549,7 +1550,6 @@ _iss sqInt thisClassIndex; _iss sqInt fullScreenFlag; _iss sqInt interruptPending; -_iss sqInt lastFreeChunk; _iss sqInt lastHash; _iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt marking; @@ -2233,7 +2233,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.733"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.734"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -22750,7 +22750,6 @@ sqInt i; sqInt low; sqInt nextFree; - sqInt nextFree1; usqInt numSlots; usqInt numSlots1; sqInt prevFree; @@ -22771,12 +22770,7 @@ free = GIV(lastFreeChunk); prevPrevFree = (prevFree = 0); while (free != 0) { - nextFree = (longAt((free + (BaseHeaderSize)) + (0 << 2))) ^ prevFree; - assert((free == 0) - || (isFreeObject(free))); - assert((prevFree == 0) - || (prevFree > free)); - + ; /* begin addressAfter: */ /* begin numSlotsOfAny: */ numSlots1 = byteAt(free + 7); @@ -22802,31 +22796,25 @@ } } - assert((prevFree == 0) - || (isFreeObject(prevFree))); - assert((prevPrevFree == 0) - || (isFreeObject(prevPrevFree))); - if (!(((longAt(free)) & 0x3FFFFF) == 0)) { - free = (longAt((prevFree + (BaseHeaderSize)) + (0 << 2))) ^ prevPrevFree; + if (prevFree == 0) { + assert(free == GIV(lastFreeChunk)); + prevFree = GIV(lastFreeChunk); + free = (longAt((GIV(lastFreeChunk) + (BaseHeaderSize)) + (0 << 2))) ^ 0; } - if ((nextFree == 0) - || (((longAt(nextFree)) & 0x3FFFFF) == 0)) { - prevPrevFree = prevFree; - prevFree = free; - free = (prevFree == GIV(firstFreeChunk) - ? 0 - : nextFree); - } else { - free = GIV(lastFreeChunk); - prevPrevFree = (prevFree = 0); - while (free > nextFree) { - nextFree = (longAt((free + (BaseHeaderSize)) + (0 << 2))) ^ prevFree; - assert(isFreeObject(nextFree)); + assert(isFreeObject(prevFree)); + if (prevPrevFree == 0) { + assert(free == (nextInSortedFreeListLinkgiven(GIV(lastFreeChunk), 0))); + prevPrevFree = GIV(lastFreeChunk); + prevFree = (longAt((GIV(lastFreeChunk) + (BaseHeaderSize)) + (0 << 2))) ^ 0; + } + else { + assert(isFreeObject(prevPrevFree)); + free = (longAt((prevFree + (BaseHeaderSize)) + (0 << 2))) ^ prevPrevFree; prevPrevFree = prevFree; prevFree = free; - free = nextFree; } + free = (longAt((prevFree + (BaseHeaderSize)) + (0 << 2))) ^ prevPrevFree; } } null; @@ -22839,11 +22827,11 @@ free1 = GIV(firstFreeChunk); prevPrevFree1 = (prevFree1 = 0); while (free1 != 0) { - nextFree1 = (longAt((free1 + (BaseHeaderSize)) + (0 << 2))) ^ prevFree1; + nextFree = (longAt((free1 + (BaseHeaderSize)) + (0 << 2))) ^ prevFree1; assert(isFreeObject(free1)); - assert((nextFree1 == 0) - || ((nextFree1 > free1) - && (isFreeObject(nextFree1)))); + assert((nextFree == 0) + || ((nextFree > free1) + && (isFreeObject(nextFree)))); assert((prevFree1 == 0) || (prevFree1 < free1)); bytes = bytesInObject(free1); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.734.mcz
by commits＠source.squeak.org 28 May '14

28 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.734.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.734 Author: eem Time: 28 May 2014, 7:45:09.663 am UUID: d6a50836-2b47-4425-a81b-07dcc902faaa Ancestors: VMMaker.oscog-eem.733 Spur: Fix bug in sortedFreeListPairwiseReverseDo:. Post block evaluation, free cannot be relied upon, so reconstruct the position in the enumeration from prevPrevFree and prevFree before moving on. Cogit: Make sure genMethodAbortTrampolineFor: has the same linkRegister code as genMethodAbortTrampoline. Simulator: Eliminate the cone inst var. cloneSimulation is, of course, fork, so only the parent slot is needed. =============== Diff against VMMaker.oscog-eem.733 =============== Item was changed: ----- Method: CogVMSimulator>>cloneSimulation (in category 'debug support') ----- cloneSimulation | savedDisplayView savedDisplayForm savedQuitBlock savedTranscript | - self setClone: nil. savedDisplayView := displayView. displayView := nil. savedDisplayForm := displayForm. displayForm = nil. savedQuitBlock := quitBlock. quitBlock := nil. savedTranscript := transcript. transcript := nil. ^[| theClone | Smalltalk garbageCollect. theClone := self veryDeepCopy. theClone parent: self; transcript: Transcript. theClone objectMemory parent: objectMemory. - self setClone: theClone. - objectMemory setClone: theClone objectMemory. theClone] ensure: [displayView := savedDisplayView. displayForm = savedDisplayForm. quitBlock := savedQuitBlock. transcript := savedTranscript]! Item was changed: Spur32BitMemoryManager subclass: #Spur32BitMMLESimulator + instanceVariableNames: 'parent bootstrapping' - instanceVariableNames: 'clone parent bootstrapping' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-SpurMemoryManagerSimulation'! Item was removed: - ----- Method: Spur32BitMMLESimulator>>getClone (in category 'accessing') ----- - getClone - - ^ clone! Item was changed: ----- Method: Spur32BitMMLESimulator>>globalGarbageCollect (in category 'gc - global') ----- globalGarbageCollect "If we're /not/ a clone, clone the VM and push it over the cliff. If it survives, destroy the clone and continue. We should be OK until next time." parent ifNil: [[coInterpreter cloneSimulation objectMemory globalGarbageCollect] on: Halt do: [:ex| (ex messageText beginsWith: 'GC number') ifTrue: [Transcript cr; cr; show: ex messageText; cr; cr. ex resume] ifFalse: [ex pass]]. - coInterpreter setClone: nil. - self setClone: nil. Smalltalk garbageCollect]. ^super globalGarbageCollect! Item was changed: ----- Method: Spur32BitMMLESimulator>>moveARunOfObjectsStartingAt:upTo: (in category 'compaction') ----- moveARunOfObjectsStartingAt: startAddress upTo: limit + | result |. + "self checkTraversableSortedFreeList." + result := super moveARunOfObjectsStartingAt: startAddress upTo: limit. + "self checkTraversableSortedFreeList." + ^result! - "startAddress = 175450576 ifTrue: [self halt]." - ^super moveARunOfObjectsStartingAt: startAddress upTo: limit! Item was removed: - ----- Method: Spur32BitMMLESimulator>>setClone: (in category 'accessing') ----- - setClone: aSpurMMSimulator - - clone := aSpurMMSimulator! Item was changed: ----- Method: SpurMemoryManager>>sortedFreeListPairwiseReverseDo: (in category 'compaction') ----- sortedFreeListPairwiseReverseDo: aBinaryBlock "Evaluate aBinaryBlock with adjacent entries in the free list, from high address to low address. The second argument is in fact the start of the next free chunk, not the free chunk itself. Use endOfMemory - bridgeSize as the second argument in the first evaluation." + | free prevFree prevPrevFree | - | free nextFree prevFree prevPrevFree | <inline: true> free := lastFreeChunk. prevPrevFree := prevFree := 0. [free ~= 0] whileTrue: + [aBinaryBlock value: free value: (prevFree = 0 - [nextFree := self nextInSortedFreeListLink: free given: prevFree. - self assert: (free = 0 or: [self isFreeObject: free]). - self assert: (prevFree = 0 or: [prevFree > free]). - aBinaryBlock value: free value: (prevFree = 0 ifTrue: [endOfMemory - self bridgeSize] ifFalse: [self startOfObject: prevFree]). + "post evaluation of aBinaryBlock the value of free may be invalid + because moveARunOfObjectsStartingAt:upTo: may have filled it. + So reconstruct the position in the enumeration." + prevFree = 0 - self assert: (prevFree = 0 or: [self isFreeObject: prevFree]). - self assert: (prevPrevFree = 0 or: [self isFreeObject: prevPrevFree]). - (self isFreeObject: free) ifFalse: - [free := self nextInSortedFreeListLink: prevFree given: prevPrevFree]. - (nextFree = 0 or: [self isFreeObject: nextFree]) ifTrue: + [self assert: free = lastFreeChunk. + prevFree := lastFreeChunk. + free := self nextInSortedFreeListLink: lastFreeChunk given: 0] - [prevPrevFree := prevFree. - prevFree := free. - free := prevFree = firstFreeChunk ifTrue: [0] ifFalse: [nextFree]] ifFalse: + [self assert: (self isFreeObject: prevFree). + prevPrevFree = 0 + ifTrue: + [self assert: free = (self nextInSortedFreeListLink: lastFreeChunk given: 0). + prevPrevFree := lastFreeChunk. + prevFree := self nextInSortedFreeListLink: lastFreeChunk given: 0] + ifFalse: + [self assert: (self isFreeObject: prevPrevFree). + free := self nextInSortedFreeListLink: prevFree given: prevPrevFree. + prevPrevFree := prevFree. + prevFree := free]. + free := self nextInSortedFreeListLink: prevFree given: prevPrevFree]] + + "| labels | + labels := Dictionary new. + labels + at: prevPrevFree put: 'ppf'; + at: prevFree put: 'pf'; + at: free put: 'f'; + at: nextFree put: 'f'. + self sortedFreeListPairwiseReverseDo: [:a :b| + Transcript cr; print: a; space. + (labels at: a ifAbsent: []) ifNotNil: [:l| Transcript nextPutAll: l]. + Transcript flush]"! - [free := lastFreeChunk. - prevPrevFree := prevFree := 0. - [free > nextFree] whileTrue: - [nextFree := self nextInSortedFreeListLink: free given: prevFree. - self assert: (self isFreeObject: nextFree). - prevPrevFree := prevFree. - prevFree := free. - free := nextFree]]]! Item was changed: StackInterpreterPrimitives subclass: #StackInterpreterSimulator + instanceVariableNames: 'parent bootstrapping byteCount breakCount sendCount printSends printReturns traceOn myBitBlt displayForm filesOpen imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize atEachStepBlock disableBooleanCheat performFilters eventQueue assertVEPAES' - instanceVariableNames: 'clone parent bootstrapping byteCount breakCount sendCount printSends printReturns traceOn myBitBlt displayForm filesOpen imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize atEachStepBlock disableBooleanCheat performFilters eventQueue assertVEPAES' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-InterpreterSimulation'! !StackInterpreterSimulator commentStamp: 'eem 9/3/2013 11:05' prior: 0! This class defines basic memory access and primitive simulation so that the StackInterpreter can run simulated in the Squeak environment. It also defines a number of handy object viewing methods to facilitate pawing around in the object memory. To see the thing actually run, you could (after backing up this image and changes), execute (StackInterpreterSimulator new openOn: Smalltalk imageName) test ((StackInterpreterSimulator newWithOptions: #(NewspeakVM true MULTIPLEBYTECODESETS true)) openOn: 'ns101.image') test and be patient both to wait for things to happen, and to accept various things that may go wrong depending on how large or unusual your image may be. We usually do this with a small and simple benchmark image. Here's an example of what Eliot uses to launch the simulator in a window. The bottom-right window has a menu packed with useful stuff: | vm | vm := StackInterpreterSimulator newWithOptions: #(). vm openOn: '/Users/eliot/Squeak/Squeak4.4/trunk44.image'. vm setBreakSelector: #&. vm openAsMorph; run! Item was changed: ----- Method: StackInterpreterSimulator>>cloneSimulation (in category 'debug support') ----- cloneSimulation | savedDisplayView savedDisplayForm savedQuitBlock savedTranscript | - self setClone: nil. savedDisplayView := displayView. displayView := nil. savedDisplayForm := displayForm. displayForm = nil. savedQuitBlock := quitBlock. quitBlock := nil. savedTranscript := transcript. transcript := nil. ^[| theClone | Smalltalk garbageCollect. theClone := self veryDeepCopy. theClone parent: self; transcript: Transcript. theClone objectMemory parent: objectMemory. - self setClone: theClone. - objectMemory setClone: theClone objectMemory. theClone] ensure: [displayView := savedDisplayView. displayForm = savedDisplayForm. quitBlock := savedQuitBlock. transcript := savedTranscript]! Item was removed: - ----- Method: StackInterpreterSimulator>>getClone (in category 'accessing') ----- - getClone - - ^ clone! Item was removed: - ----- Method: StackInterpreterSimulator>>setClone: (in category 'accessing') ----- - setClone: aSpurMMSimulator - - clone := aSpurMMSimulator! Item was changed: ----- Method: StackToRegisterMappingCogit>>genMethodAbortTrampolineFor: (in category 'initialization') ----- + genMethodAbortTrampolineFor: numArgs - genMethodAbortTrampolineFor: numArgs - "Generate the abort for a method. This abort performs either a call of ceSICMiss: to handle a single-in-line cache miss or a call of ceStackOverflow: to handle a stack overflow. It distinguishes the two by testing ResultReceiverReg. If the register is zero then this is a stack-overflow because a) the receiver has already been pushed and so can be set to zero before calling the abort, and b) the receiver must always contain an object (and hence be non-zero) on SIC miss." | jumpSICMiss | <var: #jumpSICMiss type: #'AbstractInstruction *'> opcodeIndex := 0. self CmpCq: 0 R: ReceiverResultReg. jumpSICMiss := self JumpNonZero: 0. + "on machines with a link register, pop the stack if the ReceiverResultReg = 0, + i.e. if coming through the stack check abort; frame build has already pushed it." + backEnd hasLinkRegister ifTrue: + [self AddCq: BytesPerWord R: SPReg]. + self compileTrampolineFor: #ceStackOverflow: callJumpBar: true numArgs: 1 arg: SendNumArgsReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil. jumpSICMiss jmpTarget: self Label. backEnd genPushRegisterArgsForAbortMissNumArgs: numArgs. ^self genTrampolineFor: #ceSICMiss: called: (self trampolineName: 'ceMethodAbort' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1])) callJumpBar: true numArgs: 1 arg: ReceiverResultReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true!

1 0

Re: [Pharo-dev] String >> #=
by Eliot Miranda 28 May '14

28 May '14

Hi Phillipe, On Mon, May 26, 2014 at 12:51 AM, Philippe Marschall < philippe.marschall(a)netcetera.ch> wrote: > Hi > > I have been investigating why Dictionary look up performance with String > keys is not as good as I would expected. Something I noted is that String > >> #= is implemented in terms of #compare:with:collated:. There is no short > circuit if Strings are not the same size. In my case some Strings have the > same prefix but a different length eg 'Content-Type' and 'Content-Length'. > In that case a #compare:with:collated: is performed even though we know in > advance the answer will be false because they have different sizes. > Why not rewrite String>>= aString "Answer whether the receiver sorts equally as aString. The collation order is simple ascii (with case differences)." aString isString ifFalse: [ ^ false ]. ^ (self compare: self with: aString collated: AsciiOrder) = 2 as String>>= aString "Answer whether the receiver sorts equally as aString. The collation order is simple ascii (with case differences)." (aString isString and: [self size = aString size]) ifFalse: [^false]. ^ (self compare: self withSize: with: aString collated: AsciiOrder) = 2 ? One /could/ add a replacement compare:with:collated: primitive primitiveCompareString which took the sizes as arguments to avoid asking twice. But it wouldn't be safe. One could abuse the primitive and lie about the size. So I suspect it is best to add the size check to String>>#= and accept the duplication of the primitive finding the sizes of the two strings. The cost in the primitive is minimal. A WideString version of the primitive might pay its way, but if Spur and Sista arrive soon the primitive shouldn't be faster than the optimised Smalltalk code. -- best, Eliot

3 3

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2014