Vm-dev November 2015

vm-dev@lists.squeakfoundation.org

32 participants
118 discussions

VM Maker: VMMaker.oscog-rmacnak.1520.mcz
by commits＠source.squeak.org 16 Nov '15

16 Nov '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1520.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1520 Author: rmacnak Time: 15 November 2015, 3:53:46.069 pm UUID: 9198a43e-399e-42c8-9586-90f81ffa70cf Ancestors: VMMaker.oscog-eem.1519 Get MIPSEL up to the first page fault accessing an interpreter variable. Adjust CPIC verification to distinguish between conditional and uncondtional jumps. Fix loading large literals. Increase range of MwrR to support clever backwards use of base and offset in OPICs. =============== Diff against VMMaker.oscog-eem.1519 =============== Item was added: + ----- Method: CogARMCompiler>>jumpLongConditionalTargetBeforeFollowingAddress: (in category 'inline cacheing') ----- + jumpLongConditionalTargetBeforeFollowingAddress: mcpc + ^self jumpLongTargetBeforeFollowingAddress: mcpc! Item was added: + ----- Method: CogIA32Compiler>>jumpLongConditionalTargetBeforeFollowingAddress: (in category 'inline cacheing') ----- + jumpLongConditionalTargetBeforeFollowingAddress: mcpc + ^self jumpLongTargetBeforeFollowingAddress: mcpc ! Item was added: + ----- Method: CogMIPSELCompiler>>callTargetFromReturnAddress: (in category 'inline cacheing') ----- + callTargetFromReturnAddress: callSiteReturnAddress + "csra - 16: lui t9, high + csra - 12: ori t9, low + csra - 8: jalr t9 + csra - 4: nop (delay slot)" + self assert: (self opcodeAtAddress: callSiteReturnAddress - 16) == LUI. + self assert: (self opcodeAtAddress: callSiteReturnAddress - 12) == ORI. + self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) == SPECIAL. + self assert: (self functionAtAddress: callSiteReturnAddress - 8) == JALR. + self assert: (objectMemory longAt: callSiteReturnAddress - 4) == self nop. "Delay slot" + ^self literalAtAddress: callSiteReturnAddress - 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeAddCwR (in category 'generate machine code - concretize') ----- concretizeAddCwR | val reg | val := operands at: 0. reg := self concreteRegister: (operands at: 1). self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: val)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: val)). - self machineCodeAt: 4 put: (self oriR: AT R: ZR C: (self low16BitsOf: val)). self machineCodeAt: 8 put: (self adduR: reg R: reg R: AT). ^machineCodeSize := 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeAndCqRR (in category 'generate machine code - concretize') ----- concretizeAndCqRR | value srcReg dstReg | value := operands at: 0. srcReg := self concreteRegister: (operands at: 1). dstReg := self concreteRegister: (operands at: 2). self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: value)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: value)). - self machineCodeAt: 4 put: (self oriR: AT R: ZR C: (self low16BitsOf: value)). self machineCodeAt: 8 put: (self andR: dstReg R: srcReg R: AT). ^machineCodeSize := 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeAndCwR (in category 'generate machine code - concretize') ----- concretizeAndCwR | value reg | value := operands at: 0. reg := self concreteRegister: (operands at: 1). self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: value)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: value)). - self machineCodeAt: 4 put: (self oriR: AT R: ZR C: (self low16BitsOf: value)). self machineCodeAt: 8 put: (self andR: reg R: reg R: AT). self flag: #inefficient. "Cog RTL assumes we can do any kind of conditional branch after a Cmp." self machineCodeAt: 12 put: (self andR: Cmp R: reg R: AT). ^machineCodeSize := 16! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeCallFull (in category 'generate machine code - concretize') ----- concretizeCallFull | jumpTarget | <var: #jumpTarget type: #'AbstractInstruction *'> jumpTarget := self longJumpTargetAddress. self machineCodeAt: 0 put: (self luiR: TargetReg C: (self high16BitsOf: jumpTarget)). + self machineCodeAt: 4 put: (self oriR: TargetReg R: TargetReg C: (self low16BitsOf: jumpTarget)). - self machineCodeAt: 4 put: (self oriR: TargetReg R: ZR C: (self low16BitsOf: jumpTarget)). self machineCodeAt: 8 put: (self jalR: TargetReg). self machineCodeAt: 12 put: self nop. "Delay slot" ^machineCodeSize := 16! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeCmpCwR (in category 'generate machine code - concretize') ----- concretizeCmpCwR | value reg | value := operands at: 0. reg := self concreteRegister: (operands at: 1). self flag: #todo. "value - reg or reg - value?" self flag: #inefficient. "Cog RTL assumes we can do any kind of conditional branch after a Cmp." self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: value)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: value)). - self machineCodeAt: 4 put: (self oriR: AT R: ZR C: (self low16BitsOf: value)). self machineCodeAt: 8 put: (self subuR: Cmp R: reg R: AT). self machineCodeAt: 12 put: (self sltR: CmpSLT R: reg R: AT). self machineCodeAt: 16 put: (self sltR: CmpSGT R: AT R: reg). self machineCodeAt: 20 put: (self sltuR: CmpULT R: reg R: AT). self machineCodeAt: 24 put: (self sltuR: CmpUGT R: AT R: reg). ^machineCodeSize := 28! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeJumpFull (in category 'generate machine code - concretize') ----- concretizeJumpFull | jumpTarget | <var: #jumpTarget type: #'AbstractInstruction *'> jumpTarget := self longJumpTargetAddress. self machineCodeAt: 0 put: (self luiR: TargetReg C: (self high16BitsOf: jumpTarget)). + self machineCodeAt: 4 put: (self oriR: TargetReg R: TargetReg C: (self low16BitsOf: jumpTarget)). - self machineCodeAt: 4 put: (self oriR: TargetReg R: ZR C: (self low16BitsOf: jumpTarget)). self machineCodeAt: 8 put: (self jR: TargetReg). self machineCodeAt: 12 put: self nop. "Delay slot" ^machineCodeSize := 16! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeMoveAwR (in category 'generate machine code - concretize') ----- concretizeMoveAwR | srcAddr destReg | srcAddr := operands at: 0. destReg := self concreteRegister: (operands at: 1). (self isAddressRelativeToVarBase: srcAddr) ifTrue: [self machineCodeAt: 0 put: (self lwR: destReg base: ConcreteVarBaseReg offset: srcAddr - cogit varBaseAddress). ^machineCodeSize := 4]. self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: srcAddr)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: srcAddr)). - self machineCodeAt: 4 put: (self oriR: AT R: ZR C: (self low16BitsOf: srcAddr)). self machineCodeAt: 8 put: (self lwR: destReg base: AT offset: 0). ^machineCodeSize := 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeMoveCwR (in category 'generate machine code - concretize') ----- concretizeMoveCwR <var: #word type: #sqInt> | word reg | word := operands at: 0. reg := self concreteRegister: (operands at: 1). self machineCodeAt: 0 put: (self luiR: reg C: (self high16BitsOf: word)). + self machineCodeAt: 4 put: (self oriR: reg R: reg C: (self low16BitsOf: word)). - self machineCodeAt: 4 put: (self oriR: reg R: ZR C: (self low16BitsOf: word)). ^machineCodeSize := 8! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeMoveMwrR (in category 'generate machine code - concretize') ----- concretizeMoveMwrR <var: #offset type: #sqInt> | baseReg offset destReg | offset := operands at: 0. baseReg := self concreteRegister: (operands at: 1). destReg := self concreteRegister: (operands at: 2). + (self isShortOffset: offset) ifTrue: + [self machineCodeAt: 0 put: (self lwR: destReg base: baseReg offset: offset). + ^machineCodeSize := 4]. + + self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: offset)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: offset)). + self machineCodeAt: 8 put: (self adduR: AT R: baseReg R: ZR). + self machineCodeAt: 0 put: (self lwR: destReg base: AT offset: 0). + ^machineCodeSize := 4. + ! - self machineCodeAt: 0 put: (self lwR: destReg base: baseReg offset: offset). - ^machineCodeSize := 4! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeMoveRAw (in category 'generate machine code - concretize') ----- concretizeMoveRAw | srcReg destAddr | srcReg := self concreteRegister: (operands at: 0). destAddr := operands at: 1. (self isAddressRelativeToVarBase: destAddr) ifTrue: [self machineCodeAt: 0 put: (self swR: srcReg base: ConcreteVarBaseReg offset: destAddr - cogit varBaseAddress). ^machineCodeSize := 4]. self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: destAddr)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: destAddr)). - self machineCodeAt: 4 put: (self oriR: AT R: ZR C: (self low16BitsOf: destAddr)). self machineCodeAt: 8 put: (self swR: srcReg base: AT offset: 0). ^machineCodeSize := 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeOrCwR (in category 'generate machine code - concretize') ----- concretizeOrCwR | value reg | value := operands at: 0. reg := self concreteRegister: (operands at: 1). self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: value)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: value)). - self machineCodeAt: 4 put: (self oriR: AT R: ZR C: (self low16BitsOf: value)). self machineCodeAt: 8 put: (self orR: reg R: reg R: AT). ^machineCodeSize := 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeSubCwR (in category 'generate machine code - concretize') ----- concretizeSubCwR | value reg | value := operands at: 0. reg := self concreteRegister: (operands at: 1). self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: value)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: value)). - self machineCodeAt: 4 put: (self oriR: AT R: ZR C: (self low16BitsOf: value)). self machineCodeAt: 8 put: (self subuR: reg R: reg R: AT). ^machineCodeSize := 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeTstCwR (in category 'generate machine code - concretize') ----- concretizeTstCwR | val reg | val := operands at: 0. reg := self concreteRegister: (operands at: 1). self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: val)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: val)). - self machineCodeAt: 4 put: (self oriR: AT R: ZR C: (self low16BitsOf: val)). self machineCodeAt: 8 put: (self andR: Cmp R: reg R: AT). ^machineCodeSize := 12! Item was added: + ----- Method: CogMIPSELCompiler>>concretizeXorCwR (in category 'generate machine code - concretize') ----- + concretizeXorCwR + | val reg | + val := operands at: 0. + reg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self luiR: AT C: (self high16BitsOf: val)). + self machineCodeAt: 4 put: (self oriR: AT R: AT C: (self low16BitsOf: val)). + self machineCodeAt: 8 put: (self xorR: reg R: reg R: AT). + ^machineCodeSize := 12! Item was added: + ----- Method: CogMIPSELCompiler>>isShortOffset: (in category 'accessing') ----- + isShortOffset: offset + ^offset between: -16r8000 and: 16r7FFF! Item was added: + ----- Method: CogMIPSELCompiler>>jumpLongConditionalTargetBeforeFollowingAddress: (in category 'inline cacheing') ----- + jumpLongConditionalTargetBeforeFollowingAddress: mcpc + Transcript nextPutAll: mcpc hex; cr. + "mcpc - 16: beq/ne Cmp, ZR, +12 + mcpc - 12: nop (delay slot) + mcpc - 8: j psuedo-address + mcpc - 4: nop (delay slot)" + self assert: (((self opcodeAtAddress: mcpc - 16) == BEQ) + or: [(self opcodeAtAddress: mcpc - 16) == BNE]). + self assert: (objectMemory longAt: mcpc - 12) == self nop. "Delay slot" + self assert: (self opcodeAtAddress: mcpc - 8) == J. + self assert: (objectMemory longAt: mcpc - 4) == self nop. "Delay slot" + ^self targetFromJTypeAtAddress: mcpc - 8! Item was changed: ----- Method: CogMIPSELCompiler>>jumpLongTargetBeforeFollowingAddress: (in category 'inline cacheing') ----- jumpLongTargetBeforeFollowingAddress: mcpc "Answer the target address for the long jump immediately preceding mcpc" self assert: (objectMemory longAt: mcpc - 4) == self nop. "Delay slot" self assert: (self opcodeAtAddress: mcpc - 8) == SPECIAL. self assert: (self functionAtAddress: mcpc - 8) == JR. ^self literalAtAddress: mcpc - 12 ! Item was added: + ----- Method: CogMIPSELCompiler>>literalAtAddress:put: (in category 'inline cacheing') ----- + literalAtAddress: mcpc put: newLiteral + | instruction | + self assert: (self opcodeAtAddress: mcpc) = ORI. + self assert: (self opcodeAtAddress: mcpc - 4) = LUI. + + instruction := (objectMemory longAt: mcpc) bitAnd: 16rFFFF000. + instruction := instruction bitOr: (self low16BitsOf: newLiteral). + objectMemory longAt: mcpc put: instruction. + + instruction := (objectMemory longAt: mcpc - 4) bitAnd: 16rFFFF000. + instruction := instruction bitOr: (self high16BitsOf: newLiteral). + objectMemory longAt: mcpc put: instruction. + + ^newLiteral! Item was changed: ----- Method: CogMIPSELCompiler>>literalBeforeFollowingAddress: (in category 'inline cacheing') ----- literalBeforeFollowingAddress: followingAddress "Answer the literal embedded in the instruction immediately preceding followingAddress. This is used in the MoveCwR, PushCwR and CmpCwR cases." "lui/ori, lui/ori/sw/addi, lui/ori/subu/slt/slt/sltu/sltu" + | lastOpcode lastFunction oriAddress | + lastOpcode := self opcodeAtAddress: followingAddress - 4. + lastFunction := self functionAtAddress: followingAddress - 4. - | lastInstruction lastOpcode lastFunction oriAddress | - lastInstruction := objectMemory longAt: followingAddress - 4. - lastOpcode := lastInstruction >> 26. - lastFunction := lastInstruction bitAnd: 63. oriAddress := 0. lastOpcode = ORI ifTrue: [oriAddress := followingAddress - 4]. lastOpcode = ADDIU ifTrue: [oriAddress := followingAddress - 16]. (lastOpcode = SPECIAL and: [lastFunction = SLTU]) ifTrue: [oriAddress := followingAddress - 24]. self assert: oriAddress ~= 0. ^self literalAtAddress: oriAddress ! Item was added: + ----- Method: CogMIPSELCompiler>>machineCodeBytes (in category 'generate machine code') ----- + machineCodeBytes + ^self machineCodeWords * 4! Item was changed: ----- Method: CogMIPSELCompiler>>machineCodeWords (in category 'generate machine code') ----- machineCodeWords "Answer the maximum number of words of machine code generated for any abstract instruction. e.g. CmpCwR => + lui at, <high> + ori at, <low> + subu Cmp, reg, at + slt CmpSLT, reg, at + slt CmpSGT, reg, at + slt CmpULT, reg, at + slt CmpUGT, reg, at" + self flag: #inefficient. - mov R3, #<addressByte1>, 12 - orr R3, R3, #<addressByte2>, 8 - orr R3, R3, #<addressByte3>, 4 - orr R3, R3, #<addressByte4>, 0 - cmp R?, R3" ^7! Item was added: + ----- Method: CogMIPSELCompiler>>padIfPossibleWithNopsFrom:to: (in category 'generate machine code') ----- + padIfPossibleWithNopsFrom: startAddr to: endAddr + self flag: #bogus. "Methods should be initialized with the stop instruction, not nop." + + startAddr to: endAddr - 1 by: 4 do: + [:addr | objectMemory longAt: addr put: self stop].! Item was added: + ----- Method: CogMIPSELCompiler>>storeLiteral:beforeFollowingAddress: (in category 'inline cacheing') ----- + storeLiteral: literal beforeFollowingAddress: followingAddress + "Rewrite the long constant loaded by a MoveCwR or PushCwR before the given address" + | lastOpcode oriAddress | + + self flag: #bogus. "The caller ought to know what it is patching, and this should be split into separate methods with stricter checking." + + lastOpcode := self opcodeAtAddress: followingAddress - 4. + oriAddress := 0. + lastOpcode = ORI ifTrue: [oriAddress := followingAddress - 4]. + lastOpcode = ADDIU ifTrue: [oriAddress := followingAddress - 16]. + self assert: oriAddress ~= 0. + ^self literalAtAddress: oriAddress put: literal! Item was added: + ----- Method: CogMIPSELCompiler>>targetFromJTypeAtAddress: (in category 'inline cacheing') ----- + targetFromJTypeAtAddress: mcpc + | targetLow | + targetLow := (objectMemory longAt: mcpc) bitAnd: 16r3FFFFFF. + "mcpc + 4: relative to delay slot not j" + ^((mcpc + 4) bitAnd: 16rF0000000) + (targetLow << 2) ! Item was changed: ----- Method: Cogit>>expectedClosedPICPrototype: (in category 'garbage collection') ----- expectedClosedPICPrototype: cPIC "Answer 0 if the ClosedPIC is as expected from compileClosedPICPrototype, otherwise answer an error code identifying the first discrepancy found." "self disassembleFrom: methodZoneBase + (self sizeof: CogMethod) to: methodZoneBase + closedPICSize" <var: #cPIC type: #'CogMethod *'> | pc offsetToLiteral object entryPoint | pc := cPIC asInteger + firstCPICCaseOffset. "First jump is unconditional; subsequent ones are conditional" offsetToLiteral := backEnd jumpLongByteSize. + + object := literalsManager objRefInClosedPICAt: pc - offsetToLiteral. + self assert: (object = 16r5EAF00D). + + entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. + self assert: (entryPoint = (self cPICPrototypeCaseOffset + 16rCA5E10)). + + 1 to: maxCPICCases - 1 do: + [:i | + pc := pc + cPICCaseSize. - 1 to: maxCPICCases do: - [:i| - i > 1 ifTrue: - [object := literalsManager classRefInClosedPICAt: pc - offsetToLiteral. - object = (16rBABE1F15 + i - 1) ifFalse: - [^1]]. - object := literalsManager objRefInClosedPICAt: pc - offsetToLiteral. - object = (i = 1 - ifTrue: [16r5EAF00D] - ifFalse: [16rBADA550 + i - 1]) ifFalse: - [^2]. offsetToLiteral := backEnd jumpLongConditionalByteSize. + + object := literalsManager classRefInClosedPICAt: pc - offsetToLiteral. + self assert: (object = (16rBABE1F15 + i)). + + object := literalsManager objRefInClosedPICAt: pc - offsetToLiteral. + self assert: (object = (16rBADA550 + i)). + + entryPoint := backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc. + self assert: (entryPoint = (self cPICPrototypeCaseOffset + 16rCA5E10 + (i * 16)))]. + - entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. - entryPoint = (self cPICPrototypeCaseOffset + 16rCA5E10 + (i - 1 * 16)) ifFalse: - [^3]. - pc := pc + cPICCaseSize]. - pc := pc - cPICCaseSize. entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc + cPICEndSize - literalsManager endSizeOffset. + self assert: (entryPoint = (self cPICMissTrampolineFor: 0)). + - entryPoint = (self cPICMissTrampolineFor: 0) ifFalse: - [^4]. ^0!

1 0

VM Maker: Cog-rmacnak.295.mcz
by commits＠source.squeak.org 16 Nov '15

16 Nov '15

Ryan Macnak uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-rmacnak.295.mcz ==================== Summary ==================== Name: Cog-rmacnak.295 Author: rmacnak Time: 15 November 2015, 3:53:37.223 pm UUID: 85274ec7-5fe4-4e2c-9e11-1890f49aae4e Ancestors: Cog-rmacnak.294 Get MIPSEL up to the first page fault accessing an interpreter variable. Add base-bound checks for readable/writable/executable memory. Implement more of the processor alien API. =============== Diff against Cog-rmacnak.294 =============== Item was changed: ----- Method: MIPSDisassembler>>disassemble:from:to:for:labels:on: (in category 'as yet unclassified') ----- disassemble: memory from: startPC to: limitPC for: aSymbolManager "<Cogit>" labels: labelDictionary on: aStream + aStream print: labelDictionary;cr. pc := startPC. [pc < limitPC] whileTrue: [ | word instruction | pc printOn: aStream base: 16 nDigits: 8. aStream space; space. word := memory unsignedLongAt: pc + 1. word printOn: aStream base: 16 nDigits: 8. aStream space; space. instruction := MIPSInstruction new value: word. aStream nextPutAll: (instruction decodeFor: self). aStream cr. pc := pc + OneInstruction].! Item was added: + ----- Method: MIPSELSimulator>>fetchInstruction: (in category 'as yet unclassified') ----- + fetchInstruction: address + address < exectuableBase ifTrue: [self executeFault: address]. + address > exectuableLimit ifTrue: [self executeFault: address]. + (address bitAnd: 3) = 0 ifFalse: [self error: 'Unaligned read']. + ^memory unsignedLongAt: address + 1 bigEndian: false! Item was added: + ----- Method: MIPSELSimulator>>readFault: (in category 'as yet unclassified') ----- + readFault: address + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: address + type: #read + accessor: nil) + signal + ! Item was changed: ----- Method: MIPSELSimulator>>signedByte: (in category 'as yet unclassified') ----- signedByte: address + address < readableBase ifTrue: [self readFault: address]. + address > readableLimit ifTrue: [self readFault: address]. ^memory signedByteAt: address + 1! Item was changed: ----- Method: MIPSELSimulator>>signedByte:put: (in category 'memory') ----- signedByte: address put: value + address < writableBase ifTrue: [self writeFault: address]. + address > writableLimit ifTrue: [self writeFault: address]. ^memory signedByteAt: address + 1 put: value! Item was changed: ----- Method: MIPSELSimulator>>signedHalfword: (in category 'as yet unclassified') ----- signedHalfword: address (address bitAnd: 1) = 0 ifFalse: [self error: 'Unaligned read']. + address < readableBase ifTrue: [self readFault: address]. + address > readableLimit ifTrue: [self readFault: address]. ^memory signedShortAt: address + 1! Item was changed: ----- Method: MIPSELSimulator>>signedHalfword:put: (in category 'memory') ----- signedHalfword: address put: value (address bitAnd: 1) = 0 ifFalse: [self error: 'Unaligned read']. + address < writableBase ifTrue: [self writeFault: address]. + address > writableLimit ifTrue: [self writeFault: address]. ^memory signedShortAt: address + 1 put: value! Item was changed: ----- Method: MIPSELSimulator>>signedWord: (in category 'as yet unclassified') ----- signedWord: address (address bitAnd: 3) = 0 ifFalse: [self error: 'Unaligned read']. + address < readableBase ifTrue: [self readFault: address]. + address > readableLimit ifTrue: [self readFault: address]. + ^memory longAt: address + 1! - ^memory signedLongAt: address + 1! Item was changed: ----- Method: MIPSELSimulator>>signedWord:put: (in category 'memory') ----- signedWord: address put: value (address bitAnd: 3) = 0 ifFalse: [self error: 'Unaligned read']. + address < writableBase ifTrue: [self writeFault: address]. + address > writableLimit ifTrue: [self writeFault: address]. ^memory signedLongAt: address + 1 put: value! Item was removed: - ----- Method: MIPSELSimulator>>snsignedWord: (in category 'as yet unclassified') ----- - snsignedWord: address - (address bitAnd: 3) = 0 ifFalse: [self error: 'Unaligned read']. - ^memory unsignedLongAt: address + 1 bigEndian: false! Item was changed: ----- Method: MIPSELSimulator>>unsignedByte: (in category 'as yet unclassified') ----- unsignedByte: address + address < readableBase ifTrue: [self readFault: address]. + address > readableLimit ifTrue: [self readFault: address]. ^memory at: address + 1! Item was changed: ----- Method: MIPSELSimulator>>unsignedByte:put: (in category 'memory') ----- unsignedByte: address put: value + address < writableBase ifTrue: [self writeFault: address]. + address > writableLimit ifTrue: [self writeFault: address]. ^memory at: address + 1 put: value! Item was changed: ----- Method: MIPSELSimulator>>unsignedHalfword: (in category 'as yet unclassified') ----- unsignedHalfword: address + address < readableBase ifTrue: [self readFault: address]. + address > readableLimit ifTrue: [self readFault: address]. (address bitAnd: 1) = 0 ifFalse: [self error: 'Unaligned read']. ^memory unsignedShortAt: address + 1 bigEndian: false! Item was changed: ----- Method: MIPSELSimulator>>unsignedHalfword:put: (in category 'memory') ----- unsignedHalfword: address put: value (address bitAnd: 1) = 0 ifFalse: [self error: 'Unaligned read']. + address < writableBase ifTrue: [self writeFault: address]. + address > writableLimit ifTrue: [self writeFault: address]. ^memory unsignedShortAt: address + 1 put: value! Item was changed: ----- Method: MIPSELSimulator>>unsignedWord: (in category 'as yet unclassified') ----- unsignedWord: address + address < readableBase ifTrue: [self readFault: address]. + address > readableLimit ifTrue: [self readFault: address]. (address bitAnd: 3) = 0 ifFalse: [self error: 'Unaligned read']. ^memory unsignedLongAt: address + 1 bigEndian: false! Item was changed: Object subclass: #MIPSSimulator + instanceVariableNames: 'memory registers pc instructionCount inDelaySlot readableBase writableBase exectuableBase readableLimit writableLimit exectuableLimit' - instanceVariableNames: 'memory registers pc instructionCount inDelaySlot' classVariableNames: 'EndSimulationPC' poolDictionaries: 'MIPSConstants' category: 'Cog-Processors'! !MIPSSimulator commentStamp: 'rmacnak 11/11/2015 20:33:00' prior: 0! Simulator for 32-bit MIPS, without implementation of memory access.! Item was added: + ----- Method: MIPSSimulator>>convertIntegerToInternal: (in category 'processor api') ----- + convertIntegerToInternal: anInteger + "Default conversion for 32-bit processors. 64-bit processors override." + ^anInteger signedIntToLong! Item was added: + ----- Method: MIPSSimulator>>currentInstruction (in category 'as yet unclassified') ----- + currentInstruction + ^[(MIPSDisassembler new disassemble: memory from: pc to: pc + 4)] + ifError: ['Cannot disassemble'].! Item was changed: ----- Method: MIPSSimulator>>execute (in category 'as yet unclassified') ----- execute | instruction | [pc ~= EndSimulationPC] whileTrue: + [Transcript nextPutAll: '* '; nextPutAll: self currentInstruction; flush. + instruction := MIPSInstruction new value: (self fetchInstruction: pc). - [instruction := MIPSInstruction new value: (self unsignedWord: pc). instruction decodeFor: self. pc := pc + OneInstruction].! Item was changed: ----- Method: MIPSSimulator>>executeDelaySlot (in category 'as yet unclassified') ----- executeDelaySlot | instruction | self assert: inDelaySlot not. inDelaySlot := true. + instruction := MIPSInstruction new value: (self fetchInstruction: pc). - instruction := MIPSInstruction new value: (self unsignedWord: pc). instruction decodeFor: self. inDelaySlot := false.! Item was added: + ----- Method: MIPSSimulator>>initialize (in category 'as yet unclassified') ----- + initialize + registers := Array new: 32 withAll: 16rABABAB. + pc := 0. + inDelaySlot := false. + instructionCount := 0.! Item was changed: ----- Method: MIPSSimulator>>initializeStackFor: (in category 'processor api') ----- initializeStackFor: aCogit self flag: #OABI. aCogit setStackAlignment: 8 expectedSPOffset: 0 expectedFPOffset: 0. - self initializeWithMemory: ByteArray new. ! Item was changed: ----- Method: MIPSSimulator>>initializeWithMemory: (in category 'as yet unclassified') ----- initializeWithMemory: aByteArray + memory := aByteArray.! - memory := aByteArray. - registers := Array new: 32 withAll: 0. - pc := 0. - inDelaySlot := false. - instructionCount := 0.! Item was added: + ----- Method: MIPSSimulator>>pc: (in category 'processor api') ----- + pc: newPC + pc := newPC.! Item was changed: ----- Method: MIPSSimulator>>printOn: (in category 'as yet unclassified') ----- printOn: stream stream nextPutAll: self class name; nextPut: $:; cr. 0 to: 31 do: [:reg | | hex | stream space. stream nextPutAll: (MIPSConstants nameForRegister: reg). stream space. hex := (self unsignedRegister: reg) printStringBase: 16. 8 - hex size timesRepeat: [stream nextPut: $0]. stream nextPutAll: hex. stream space. (self signedRegister: reg) printOn: stream. stream cr]. + + stream nextPutAll: self currentInstruction.! - ! Item was added: + ----- Method: MIPSSimulator>>runInMemory:minimumAddress:readOnlyBelow: (in category 'processor api') ----- + runInMemory: aMemory minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress + "Note that minimumWritableAddress is both the minimum writeable address AND the maximum executable address" + memory := aMemory. + readableBase := minimumAddress. + writableBase := minimumWritableAddress. + exectuableBase := minimumAddress. + readableLimit := aMemory size. + writableLimit := aMemory size. + exectuableLimit := minimumWritableAddress. + self execute.! Item was changed: ----- Method: MIPSSimulator>>setFramePointer:stackPointer: (in category 'processor api') ----- setFramePointer: fp stackPointer: sp self signedRegister: SP put: sp. self signedRegister: FP put: fp.! Item was changed: ----- Method: MIPSSimulator>>signedRegister: (in category 'registers') ----- + signedRegister: registerNumber - signedRegister: registerNumber registerNumber == ZR ifTrue: [^0] ifFalse: [^registers at: registerNumber + 1].! Item was changed: ----- Method: MIPSSimulator>>signedRegister:put: (in category 'registers') ----- signedRegister: registerNumber put: signedValue self assert: (signedValue between: -16r80000000 and: 16r7FFFFFFF). registerNumber == ZR ifFalse: [registers at: registerNumber + 1 put: signedValue].! Item was added: + ----- Method: MIPSSimulator>>simulateLeafCallOf:nextpc:memory: (in category 'processor api') ----- + simulateLeafCallOf: address nextpc: nextpc memory: aMemory + self signedRegister: RA put: nextpc. + pc := address.! Item was added: + ----- Method: MIPSSimulator>>smashRegistersWithValuesFrom:by: (in category 'processor api') ----- + smashRegistersWithValuesFrom: base by: step + "Ignore this - we do a stronger check later."! Item was changed: ----- Method: MIPSSimulator>>sp (in category 'processor api') ----- sp ^self signedRegister: SP! Item was changed: ----- Method: MIPSSimulator>>unsignedRegister: (in category 'registers') ----- unsignedRegister: registerNumber registerNumber == ZR ifTrue: [^0] ifFalse: [^self signed32ToUnsigned32: (registers at: registerNumber + 1)].! Item was changed: ----- Method: MIPSSimulator>>unsignedRegister:put: (in category 'registers') ----- unsignedRegister: registerNumber put: unsignedValue registerNumber == ZR ifFalse: [registers at: registerNumber + 1 put: (self unsigned32ToSigned32: unsignedValue)].!

1 0

[commit][3501] Fix for Mantis 7837 - Socket connect on a UDP socket does not do the
by commits＠squeakvm.org 16 Nov '15

16 Nov '15

Revision: 3501 Author: lewis Date: 2015-11-15 15:53:15 -0800 (Sun, 15 Nov 2015) Log Message: ----------- Fix for Mantis 7837 - Socket connect on a UDP socket does not do the connect() call on Unix VM. This prevents query of a connected UDP socket to find an address that an external system may use to connect to the local system. Verify fix by evaluating the following to find a local IPV4 address: | s local | s := Socket newUDP setPeer: (NetNameResolver addressForName: '8.8.8.8') port: 0.l. local := s localAddress. s close. local "==> #[172 16 0 10]" Modified Paths: -------------- branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c Modified: branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c =================================================================== --- branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c 2015-11-15 23:52:01 UTC (rev 3500) +++ branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c 2015-11-15 23:53:15 UTC (rev 3501) @@ -775,9 +775,12 @@ /* --- UDP/RAW --- */ if (SOCKET(s) >= 0) { + int result; memcpy((void *)&SOCKETPEER(s), (void *)&saddr, sizeof(saddr)); SOCKETPEERSIZE(s)= sizeof(struct sockaddr_in); - SOCKETSTATE(s)= Connected; + result= connect(SOCKET(s), (struct sockaddr *)&saddr, sizeof(saddr)); + if (result == 0) + SOCKETSTATE(s)= Connected; } } else @@ -2105,9 +2108,12 @@ { if (SOCKET(s) >= 0) { + int result; memcpy((void *)&SOCKETPEER(s), socketAddress(addr), addressSize(addr)); SOCKETPEERSIZE(s)= addressSize(addr); - SOCKETSTATE(s)= Connected; + result= connect(SOCKET(s), socketAddress(addr), addressSize(addr)); + if (result == 0) + SOCKETSTATE(s)= Connected; } } else /* --- TCP --- */

1 0

[commit][3500] Fix for Mantis 7837 - Socket connect on a UDP socket does not do the connect ()
by commits＠squeakvm.org 16 Nov '15

16 Nov '15

Revision: 3500 Author: lewis Date: 2015-11-15 15:52:01 -0800 (Sun, 15 Nov 2015) Log Message: ----------- Fix for Mantis 7837 - Socket connect on a UDP socket does not do the connect() call on Unix VM. This prevents query of a connected UDP socket to find an address that an external system may use to connect to the local system. Verify fix by evaluating the following to find a local IPV4 address: | s local | s := Socket newUDP setPeer: (NetNameResolver addressForName: '8.8.8.8') port: 0.l. local := s localAddress. s close. local "==> #[172 16 0 10]" Modified Paths: -------------- trunk/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c Modified: trunk/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c =================================================================== --- trunk/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c 2015-11-15 17:33:07 UTC (rev 3499) +++ trunk/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c 2015-11-15 23:52:01 UTC (rev 3500) @@ -695,9 +695,12 @@ /* --- UDP --- */ if (SOCKET(s) >= 0) { + int result; memcpy((void *)&SOCKETPEER(s), (void *)&saddr, sizeof(saddr)); SOCKETPEERSIZE(s)= sizeof(struct sockaddr_in); - SOCKETSTATE(s)= Connected; + result= connect(SOCKET(s), (struct sockaddr *)&saddr, sizeof(saddr)); + if (result == 0) + SOCKETSTATE(s)= Connected; } } else @@ -1978,9 +1981,12 @@ { if (SOCKET(s) >= 0) { + int result; memcpy((void *)&SOCKETPEER(s), socketAddress(addr), addressSize(addr)); SOCKETPEERSIZE(s)= addressSize(addr); - SOCKETSTATE(s)= Connected; + result= connect(SOCKET(s), socketAddress(addr), addressSize(addr)); + if (result == 0) + SOCKETSTATE(s)= Connected; } } else /* --- TCP --- */

1 0

[commit][3499] Fix for Mantix 7833 by Nicolai Hess to support return from full screen
by commits＠squeakvm.org 15 Nov '15

15 Nov '15

Revision: 3499 Author: lewis Date: 2015-11-15 09:33:07 -0800 (Sun, 15 Nov 2015) Log Message: ----------- Fix for Mantix 7833 by Nicolai Hess to support return from full screen mode on certain window managers that do not handle it properly. Also add command line parameter -fullscreenDirect and matching environment variable SQUEAK_FULLSCREEN_DIRECT to allow original behavior to be specified in the case of a simple window manager (e.g. twm) than does not understand the _NET_WM_STATE_FULLSCREEN window manager hint. Modified Paths: -------------- branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2015-11-15 17:32:03 UTC (rev 3498) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2015-11-15 17:33:07 UTC (rev 3499) @@ -1370,11 +1370,13 @@ if (!strcmp(argv[0], arg)) \ return parseModuleArgument(argc, argv, &type##Module, #type, name); - moduleArg("-nodisplay", display, "null"); - moduleArg("-display", display, "X11"); - moduleArg("-headless", display, "X11"); - moduleArg("-quartz", display, "Quartz"); - moduleArg("-nosound", sound, "null"); + moduleArg("-nodisplay", display, "null"); + moduleArg("-display", display, "X11"); + moduleArg("-headless", display, "X11"); + moduleArg("-fullscreen", display, "X11"); + moduleArg("-fullscreenDirect", display, "X11"); + moduleArg("-quartz", display, "Quartz"); + moduleArg("-nosound", sound, "null"); # undef moduleArg Modified: branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c =================================================================== --- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2015-11-15 17:32:03 UTC (rev 3498) +++ branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2015-11-15 17:33:07 UTC (rev 3499) @@ -336,6 +336,7 @@ int sleepWhenUnmapped= 0; int noTitle= 0; int fullScreen= 0; +int fullScreenDirect= 0; int iconified= 0; int withSpy= 0; @@ -5084,6 +5085,57 @@ } +static void enterFullScreenMode(Window root) +{ + XSynchronize(stDisplay, True); + overrideRedirect(stDisplay, stWindow, True); + XReparentWindow(stDisplay, stWindow, root, 0, 0); +#if 1 + XResizeWindow(stDisplay, stWindow, scrW, scrH); +#else + XResizeWindow(stDisplay, stParent, scrW, scrH); +#endif + XLowerWindow(stDisplay, stParent); + XRaiseWindow(stDisplay, stWindow); + XSetInputFocus(stDisplay, stWindow, RevertToPointerRoot, CurrentTime); + XSynchronize(stDisplay, False); +} + + +static void returnFromFullScreenMode() +{ + XSynchronize(stDisplay, True); + XRaiseWindow(stDisplay, stParent); + XReparentWindow(stDisplay, stWindow, stParent, 0, 0); + overrideRedirect(stDisplay, stWindow, False); +#if 1 + XResizeWindow(stDisplay, stWindow, scrW, scrH); +#else + XResizeWindow(stDisplay, stParent, winW, winH); +#endif + XSetInputFocus(stDisplay, stWindow, RevertToPointerRoot, CurrentTime); + XSynchronize(stDisplay, False); +} + + +static void sendFullScreenHint(int enable) +{ + XEvent xev; + Atom wm_state = XInternAtom(stDisplay, "_NET_WM_STATE", False); + Atom fullscreen = XInternAtom(stDisplay, "_NET_WM_STATE_FULLSCREEN", False); + + memset(&xev, 0, sizeof(xev)); + xev.type = ClientMessage; + xev.xclient.window = stParent; + xev.xclient.message_type = wm_state; + xev.xclient.format = 32; + xev.xclient.data.l[0] = enable; /* 1 enable, 0 disable fullscreen */ + xev.xclient.data.l[1] = fullscreen; + xev.xclient.data.l[2] = 0; + XSendEvent(stDisplay, DefaultRootWindow(stDisplay), False, SubstructureNotifyMask, &xev); +} + + static sqInt display_ioSetFullScreen(sqInt fullScreen) { int winX, winY; @@ -5110,18 +5162,10 @@ winW= (winW / sizeof(void *)) * sizeof(void *); setSavedWindowSize((winW << 16) + (winH & 0xFFFF)); savedWindowOrigin= (winX << 16) + (winY & 0xFFFF); - XSynchronize(stDisplay, True); - overrideRedirect(stDisplay, stWindow, True); - XReparentWindow(stDisplay, stWindow, root, 0, 0); -# if 1 - XResizeWindow(stDisplay, stWindow, scrW, scrH); -# else - XResizeWindow(stDisplay, stParent, scrW, scrH); -# endif - XLowerWindow(stDisplay, stParent); - XRaiseWindow(stDisplay, stWindow); - XSetInputFocus(stDisplay, stWindow, RevertToPointerRoot, CurrentTime); - XSynchronize(stDisplay, False); + if (fullScreenDirect) + enterFullScreenMode(root); /* simple window manager, e.g. twm */ + else + sendFullScreenHint(1); /* Required for Compiz window manager */ windowState= WIN_ZOOMED; fullDisplayUpdate(); } @@ -5142,17 +5186,10 @@ winX= savedWindowOrigin >> 16; winY= savedWindowOrigin & 0xFFFF; savedWindowOrigin= -1; /* prevents consecutive full-screen disables */ - XSynchronize(stDisplay, True); - XRaiseWindow(stDisplay, stParent); - XReparentWindow(stDisplay, stWindow, stParent, 0, 0); - overrideRedirect(stDisplay, stWindow, False); -# if 1 - XResizeWindow(stDisplay, stWindow, scrW, scrH); -# else - XResizeWindow(stDisplay, stParent, winW, winH); -# endif - XSetInputFocus(stDisplay, stWindow, RevertToPointerRoot, CurrentTime); - XSynchronize(stDisplay, False); + if (fullScreenDirect) + returnFromFullScreenMode(); /* simple window manager, e.g. twm */ + else + sendFullScreenHint(0); /* Required for Compiz window manager */ windowState= WIN_CHANGED; } } @@ -7266,6 +7303,7 @@ printf(" -compositioninput enable overlay window for composed characters\n"); printf(" -display <dpy> display on <dpy> (default: $DISPLAY)\n"); printf(" -fullscreen occupy the entire screen\n"); + printf(" -fullscreenDirect simple window manager support for fullscreen\n"); #if (USE_X11_GLX) printf(" -glxdebug <n> set GLX debug verbosity level to <n>\n"); #endif @@ -7325,6 +7363,7 @@ if (getenv("SQUEAK_NOTITLE")) noTitle= 1; if (getenv("SQUEAK_NOXDND")) useXdnd= 0; if (getenv("SQUEAK_FULLSCREEN")) fullScreen= 1; + if (getenv("SQUEAK_FULLSCREEN_DIRECT")) fullScreenDirect= 1; if (getenv("SQUEAK_ICONIC")) iconified= 1; if (getenv("SQUEAK_MAPDELBS")) mapDelBs= 1; if (getenv("SQUEAK_SWAPBTN")) swapBtn= 1; @@ -7356,6 +7395,7 @@ else if (!strcmp(arg, "-mapdelbs")) mapDelBs= 1; else if (!strcmp(arg, "-swapbtn")) swapBtn= 1; else if (!strcmp(arg, "-fullscreen")) fullScreen= 1; + else if (!strcmp(arg, "-fullscreenDirect")) fullScreenDirect= 1; else if (!strcmp(arg, "-iconic")) iconified= 1; #if !defined (INIT_INPUT_WHEN_KEY_PRESSED) else if (!strcmp(arg, "-nointl")) initInput= initInputNone;

1 0

[commit][3498] Fix for Mantix 7833 by Nicolai Hess to support return from full screen
by commits＠squeakvm.org 15 Nov '15

15 Nov '15

Revision: 3498 Author: lewis Date: 2015-11-15 09:32:03 -0800 (Sun, 15 Nov 2015) Log Message: ----------- Fix for Mantix 7833 by Nicolai Hess to support return from full screen mode on certain window managers that do not handle it properly. Also add command line parameter -fullscreenDirect and matching environment variable SQUEAK_FULLSCREEN_DIRECT to allow original behavior to be specified in the case of a simple window manager (e.g. twm) than does not understand the _NET_WM_STATE_FULLSCREEN window manager hint. Modified Paths: -------------- trunk/platforms/unix/vm/sqUnixMain.c trunk/platforms/unix/vm-display-X11/sqUnixX11.c Modified: trunk/platforms/unix/vm/sqUnixMain.c =================================================================== --- trunk/platforms/unix/vm/sqUnixMain.c 2015-11-14 20:16:45 UTC (rev 3497) +++ trunk/platforms/unix/vm/sqUnixMain.c 2015-11-15 17:32:03 UTC (rev 3498) @@ -1046,11 +1046,13 @@ if (!strcmp(argv[0], arg)) \ return parseModuleArgument(argc, argv, &type##Module, #type, name); - moduleArg("-nodisplay", display, "null"); - moduleArg("-display", display, "X11"); - moduleArg("-headless", display, "X11"); - moduleArg("-quartz", display, "Quartz"); - moduleArg("-nosound", sound, "null"); + moduleArg("-nodisplay", display, "null"); + moduleArg("-display", display, "X11"); + moduleArg("-headless", display, "X11"); + moduleArg("-fullscreen", display, "X11"); + moduleArg("-fullscreenDirect", display, "X11"); + moduleArg("-quartz", display, "Quartz"); + moduleArg("-nosound", sound, "null"); # undef moduleArg Modified: trunk/platforms/unix/vm-display-X11/sqUnixX11.c =================================================================== --- trunk/platforms/unix/vm-display-X11/sqUnixX11.c 2015-11-14 20:16:45 UTC (rev 3497) +++ trunk/platforms/unix/vm-display-X11/sqUnixX11.c 2015-11-15 17:32:03 UTC (rev 3498) @@ -335,6 +335,7 @@ int sleepWhenUnmapped= 0; int noTitle= 0; int fullScreen= 0; +int fullScreenDirect= 0; int iconified= 0; int closeQuit= 0; int withSpy= 0; @@ -3982,6 +3983,57 @@ } +static void enterFullScreenMode(Window root) +{ + XSynchronize(stDisplay, True); + overrideRedirect(stDisplay, stWindow, True); + XReparentWindow(stDisplay, stWindow, root, 0, 0); +#if 1 + XResizeWindow(stDisplay, stWindow, scrW, scrH); +#else + XResizeWindow(stDisplay, stParent, scrW, scrH); +#endif + XLowerWindow(stDisplay, stParent); + XRaiseWindow(stDisplay, stWindow); + XSetInputFocus(stDisplay, stWindow, RevertToPointerRoot, CurrentTime); + XSynchronize(stDisplay, False); +} + + +static void returnFromFullScreenMode() +{ + XSynchronize(stDisplay, True); + XRaiseWindow(stDisplay, stParent); + XReparentWindow(stDisplay, stWindow, stParent, 0, 0); + overrideRedirect(stDisplay, stWindow, False); +#if 1 + XResizeWindow(stDisplay, stWindow, scrW, scrH); +#else + XResizeWindow(stDisplay, stParent, winW, winH); +#endif + XSetInputFocus(stDisplay, stWindow, RevertToPointerRoot, CurrentTime); + XSynchronize(stDisplay, False); +} + + +static void sendFullScreenHint(int enable) +{ + XEvent xev; + Atom wm_state = XInternAtom(stDisplay, "_NET_WM_STATE", False); + Atom fullscreen = XInternAtom(stDisplay, "_NET_WM_STATE_FULLSCREEN", False); + + memset(&xev, 0, sizeof(xev)); + xev.type = ClientMessage; + xev.xclient.window = stParent; + xev.xclient.message_type = wm_state; + xev.xclient.format = 32; + xev.xclient.data.l[0] = enable; /* 1 enable, 0 disable fullscreen */ + xev.xclient.data.l[1] = fullscreen; + xev.xclient.data.l[2] = 0; + XSendEvent(stDisplay, DefaultRootWindow(stDisplay), False, SubstructureNotifyMask, &xev); +} + + static sqInt display_ioSetFullScreen(sqInt fullScreen) { int winX, winY; @@ -4007,18 +4059,10 @@ winW= (winW / sizeof(void *)) * sizeof(void *); setSavedWindowSize((winW << 16) + (winH & 0xFFFF)); savedWindowOrigin= (winX << 16) + (winY & 0xFFFF); - XSynchronize(stDisplay, True); - overrideRedirect(stDisplay, stWindow, True); - XReparentWindow(stDisplay, stWindow, root, 0, 0); -# if 1 - XResizeWindow(stDisplay, stWindow, scrW, scrH); -# else - XResizeWindow(stDisplay, stParent, scrW, scrH); -# endif - XLowerWindow(stDisplay, stParent); - XRaiseWindow(stDisplay, stWindow); - XSetInputFocus(stDisplay, stWindow, RevertToPointerRoot, CurrentTime); - XSynchronize(stDisplay, False); + if (fullScreenDirect) + enterFullScreenMode(root); /* simple window manager, e.g. twm */ + else + sendFullScreenHint(1); /* Required for Compiz window manager */ windowState= WIN_ZOOMED; fullDisplayUpdate(); } @@ -4039,17 +4083,10 @@ winX= savedWindowOrigin >> 16; winY= savedWindowOrigin & 0xFFFF; savedWindowOrigin= -1; /* prevents consecutive full-screen disables */ - XSynchronize(stDisplay, True); - XRaiseWindow(stDisplay, stParent); - XReparentWindow(stDisplay, stWindow, stParent, 0, 0); - overrideRedirect(stDisplay, stWindow, False); -# if 1 - XResizeWindow(stDisplay, stWindow, scrW, scrH); -# else - XResizeWindow(stDisplay, stParent, winW, winH); -# endif - XSetInputFocus(stDisplay, stWindow, RevertToPointerRoot, CurrentTime); - XSynchronize(stDisplay, False); + if (fullScreenDirect) + returnFromFullScreenMode(); /* simple window manager, e.g. twm */ + else + sendFullScreenHint(0); /* Required for Compiz window manager */ windowState= WIN_CHANGED; } } @@ -5987,6 +6024,7 @@ printf(" -compositioninput enable overlay window for composed characters\n"); printf(" -display <dpy> display on <dpy> (default: $DISPLAY)\n"); printf(" -fullscreen occupy the entire screen\n"); + printf(" -fullscreenDirect simple window manager support for fullscreen\n"); #if (USE_X11_GLX) printf(" -glxdebug <n> set GLX debug verbosity level to <n>\n"); #endif @@ -6044,6 +6082,7 @@ if (getenv("SQUEAK_NOTITLE")) noTitle= 1; if (getenv("SQUEAK_NOXDND")) useXdnd= 0; if (getenv("SQUEAK_FULLSCREEN")) fullScreen= 1; + if (getenv("SQUEAK_FULLSCREEN_DIRECT")) fullScreenDirect= 1; if (getenv("SQUEAK_ICONIC")) iconified= 1; if (getenv("SQUEAK_CLOSEQUIT")) closeQuit= 1; if (getenv("SQUEAK_MAPDELBS")) mapDelBs= 1; @@ -6076,6 +6115,7 @@ else if (!strcmp(arg, "-mapdelbs")) mapDelBs= 1; else if (!strcmp(arg, "-swapbtn")) swapBtn= 1; else if (!strcmp(arg, "-fullscreen")) fullScreen= 1; + else if (!strcmp(arg, "-fullscreenDirect")) fullScreenDirect= 1; else if (!strcmp(arg, "-iconic")) iconified= 1; else if (!strcmp(arg, "-closequit")) closeQuit= 1; #if !defined (INIT_INPUT_WHEN_KEY_PRESSED)

1 0

[commit][3497] Spur Xcode build: Rename intplugins to plugins.
by commits＠squeakvm.org 14 Nov '15

14 Nov '15

Revision: 3497 Author: eliot Date: 2015-11-14 12:16:45 -0800 (Sat, 14 Nov 2015) Log Message: ----------- Spur Xcode build: Rename intplugins to plugins. Nuke some unused version tbd frameworks. Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-12 22:19:13 UTC (rev 3496) +++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-14 20:16:45 UTC (rev 3497) @@ -165,9 +165,6 @@ 9493827A1B001C7E00C802B2 /* sqSqueakInfoPlistInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 9412CAE50E6C05EC00DB8625 /* sqSqueakInfoPlistInterface.m */; }; 94B9533510E6BD7100DC476A /* MacMenuOS9ToOSX.m in Sources */ = {isa = PBXBuildFile; fileRef = 94B9533410E6BD7100DC476A /* MacMenuOS9ToOSX.m */; }; 94BB096E1BB47DDB0016BFDF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94BB096B1BB47DDB0016BFDF /* Security.framework */; }; - 94BB09721BB47F9B0016BFDF /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 94BB09711BB47F9B0016BFDF /* libz.tbd */; }; - 94BB09741BB47FB20016BFDF /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 94BB09731BB47FB20016BFDF /* libstdc++.tbd */; }; - 94BB09761BB47FCD0016BFDF /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 94BB09751BB47FCD0016BFDF /* libc++.tbd */; }; 94BB09781BB480AC0016BFDF /* HostWindowPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 94E658FA0DDD03FE00358328 /* HostWindowPlugin.c */; }; 94C315341AD4949B0096E59D /* AsynchFilePlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 94C315311AD4949B0096E59D /* AsynchFilePlugin.c */; }; 94C317511AD495CD0096E59D /* JoystickTabletPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 94C317491AD495CD0096E59D /* JoystickTabletPlugin.c */; }; @@ -392,9 +389,6 @@ 94B9533310E6BD7100DC476A /* MacMenuOS9ToOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacMenuOS9ToOSX.h; sourceTree = "<group>"; }; 94B9533410E6BD7100DC476A /* MacMenuOS9ToOSX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MacMenuOS9ToOSX.m; sourceTree = "<group>"; }; 94BB096B1BB47DDB0016BFDF /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; - 94BB09711BB47F9B0016BFDF /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - 94BB09731BB47FB20016BFDF /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; }; - 94BB09751BB47FCD0016BFDF /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 94BCABBF10AB72A600F87527 /* sqSqueakOSXFileDirectoryInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqSqueakOSXFileDirectoryInterface.h; path = vm/OSX/sqSqueakOSXFileDirectoryInterface.h; sourceTree = "<group>"; }; 94BCABC010AB72A600F87527 /* sqSqueakOSXFileDirectoryInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = sqSqueakOSXFileDirectoryInterface.m; path = vm/OSX/sqSqueakOSXFileDirectoryInterface.m; sourceTree = "<group>"; }; 94BCAD1B10AB942300F87527 /* sqSqueakOSXApplication+attributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sqSqueakOSXApplication+attributes.h"; path = "vm/OSX/sqSqueakOSXApplication+attributes.h"; sourceTree = "<group>"; }; @@ -584,9 +578,6 @@ buildActionMask = 2147483647; files = ( 94FA4CE31BB4DD9000C1BE8F /* OpenGL.framework in Frameworks */, - 94BB09761BB47FCD0016BFDF /* libc++.tbd in Frameworks */, - 94BB09741BB47FB20016BFDF /* libstdc++.tbd in Frameworks */, - 94BB09721BB47F9B0016BFDF /* libz.tbd in Frameworks */, 9487749D10C64DD800E4AEC5 /* Cocoa.framework in Frameworks */, 9487749E10C64DD800E4AEC5 /* Foundation.framework in Frameworks */, 9487749F10C64DD800E4AEC5 /* AudioToolbox.framework in Frameworks */, @@ -692,9 +683,6 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( - 94BB09751BB47FCD0016BFDF /* libc++.tbd */, - 94BB09731BB47FB20016BFDF /* libstdc++.tbd */, - 94BB09711BB47F9B0016BFDF /* libz.tbd */, 94BB096B1BB47DDB0016BFDF /* Security.framework */, 947E61C410AA03DC00D3B69E /* AppKit.framework */, 947E61C210AA03C300D3B69E /* Cocoa.framework */, @@ -1239,7 +1227,7 @@ 94E658DC0DDD03FE00358328 /* src */ = { isa = PBXGroup; children = ( - 94E658DD0DDD03FE00358328 /* plugins */, + 94E658E20DDD03FE00358328 /* plugins */, 94E658DE0DDD03FE00358328 /* plugins.int */, 94E658DF0DDD03FE00358328 /* vm */, ); @@ -1247,13 +1235,6 @@ path = ../../spurstack64src; sourceTree = "<group>"; }; - 94E658DD0DDD03FE00358328 /* plugins */ = { - isa = PBXGroup; - children = ( - ); - path = plugins; - sourceTree = "<group>"; - }; 94E658DF0DDD03FE00358328 /* vm */ = { isa = PBXGroup; children = ( @@ -1266,13 +1247,12 @@ 94F478C51BB527440069E57B /* gcc3x-cointerp.c */, 94F478C61BB527440069E57B /* cointerp.h */, 94F478C71BB527440069E57B /* interp.h */, - 94E658E20DDD03FE00358328 /* intplugins */, 94E659200DDD03FE00358328 /* sqNamedPrims.h */, ); path = vm; sourceTree = "<group>"; }; - 94E658E20DDD03FE00358328 /* intplugins */ = { + 94E658E20DDD03FE00358328 /* plugins */ = { isa = PBXGroup; children = ( 94E658E40DDD03FE00358328 /* ADPCMCodecPlugin.c */, @@ -1314,8 +1294,8 @@ 949382491B00103A00C802B2 /* VMProfileMacSupportPlugin.c */, 94E6591F0DDD03FE00358328 /* ZipPlugin.c */, ); - name = intplugins; - path = ../../src/plugins; + name = plugins; + path = ../src/plugins; sourceTree = "<group>"; }; 94E659420DDD04FA00358328 /* AsynchFilePlugin */ = {

1 0

Re: RTL and MIPS
by Eliot Miranda 14 Nov '15

14 Nov '15

Hi Ryan replying to the list because this may be of more general interest) On Thu, Nov 5, 2015 at 6:01 PM, Ryan Macnak <rmacnak(a)gmail.com> wrote: > Hi Eliot, > > I've been looking into a MIPSEL port of Cog. MIPS is about as simple an > architecture as one could hope for, and supporting it would bring Cog up to > par with the architectures supported by Android and Chrome OS (modulo the > 64-bit support in flight). I've managed to produce a function stack VM with > only a few extra ifdefs and a stub Alien implementation. > > A Cog port looks fairly straightforward, except for the RTL's assumption > of condition flags. MIPS doesn't have condition flags, which means to > efficiently translate tests and branches we need to consider the test and > branch together, instead of independently as Cog is currently setup to do. > E.g., > > CmpR: a R: b > JumpZero: target > => > BEQ a, b, target > > AddR: a R: b > JumpOverflow: target > => > MOV t1, b > ADDU b, a, b > XOR t2, b, a > XOR t1, b, t1 > AND t1, t1, t2 > BLTZ t1, target > > One way to handle this is to remove compare, test and conditional branches > from the RTL and add combined instructions like CmpR:R:JumpEqual: and > AddR:R:JumpOverflow:. Another is to allow concretization to look at the > preceding or following instruction. What do you think? > I think the former is too much work. I had assumed that the JIT takes advantage of the separation of comparison/arithmetic from conditional branch, but when I looked the other day I couldn't find an example. So in principle it's a valid approach. However, I expect that the latter is extremely simple. The pattern I would investigate is to do the work in computeMaximumSize, adding support for accessing the previous instruction. So e.g. rewrite computeMaximumSizes "This pass assigns maximum sizes to all abstract instructions and eliminates jump fixups. It hence assigns the maximum address an instruction will occur at which allows the next pass to conservatively size jumps." <inline: false> <var: #abstractInstruction type: #'AbstractInstruction *'> | relativeAddress | literalsManager dumpLiterals: false. relativeAddress := 0. 0 to: opcodeIndex - 1 do: [:i| | abstractInstruction | abstractInstruction := self abstractInstructionAt: i. abstractInstruction address: relativeAddress; maxSize: abstractInstruction computeMaximumSize. relativeAddress := relativeAddress + abstractInstruction maxSize] to computeMaximumSizes "This pass assigns maximum sizes to all abstract instructions and eliminates jump fixups. It hence assigns the maximum address an instruction will occur at which allows the next pass to conservatively size jumps." <inline: false> <var: #abstractInstruction type: #'AbstractInstruction *'> | relativeAddress | literalsManager dumpLiterals: false. relativeAddress := 0. 0 to: opcodeIndex - 1 do: [:i| | abstractInstruction | abstractInstruction := self abstractInstructionAt: i. abstractInstruction address: relativeAddress; >> maxSize: (abstractInstruction computeMaximumSizeAt: i). relativeAddress := relativeAddress + abstractInstruction maxSize] and have the CogMIPSELCompiler's computeMaximumSIzeAt: search back for the associated compare instruction, absorb it into the current (and possibly following branch), and collapse the comparison to a label. There are sequences like this in 32-bit Spur's genInnerPrimitiveAtPut: that require absorbing the comparison into more than one conditional: cogit CmpCq: objectMemory arrayFormat R: formatReg. jumpNotIndexablePointers := cogit JumpBelow: 0. jumpHasFixedFields := cogit JumpNonZero: 0. > Also, how do branch offsets get fixed if the actual size of an RTL > instruction is smaller than what is answered by computeMaximumSize? > The idea is that branch distances are computed when the maximum sizes are known, and that if a branch is long when jumping across the maximum distance it must remain so when later generated, even if intervening instructions are small enough to render the distance small. So... Branch offsets are fixed by the following algorithm in Cogit>>computeMaximumSizes (1.), Cogit>>generateInstructionsAt: (2. 3.) & CogAbstractInstruction>>#sizePCDependentInstructionAt: (2.). 1. Make a pass over the sequence of instructions assigning their maximum size. This will be the same as the actual size for all non-pc-dependent instructions. Assign addresses to instructions based on this maximum size 2. Make a pass over the sequence of instructions computing actual sizes of pc-dependent instructions (jumps, pc-relative data references) based on these max sizes. If a branch distance is small jumping across maximum sizes it will remain small when jumping across actual sizes. 3. Make a final pass that generates machine code (to the memory inside each instruction) that computes actual size. For the pc-dependent instructions, if they needed large offsets in pass 2 they use large offsets even if only a small offset is needed jumping over actual sizes. This keeps the offset computation stable and hence these three passes are sufficient. _,,,^..^,,,_ best, Eliot

1 0

Re: [Cuis] New Introductory Tutorial
by KenD 14 Nov '15

14 Nov '15

On Sat, 14 Nov 2015 05:02:53 +0000 EuanM <euanmee(a)gmail.com> wrote: > I've created Yet Another Smalltalk First > Steps tutorial. ... > If you have experience running any of these systems on Windows, Linux > or MacOS, please check to see if I have the instructions correct for > your chosen pairing of Smalltalk and OS platform. On Linux, Cuis works fine from the command line once the proper SqueakVM is installed. E.g. in the Cuis-Smalltalk-Dev directory squeak Cuis4.2-2571.image > The document is at: > http://smalltalkinsmallsteps.blogspot.co.uk/2015/11/get-smalltalk-up-and-ru… The different Squeak VMs are transition points and might need some explanation. The stack-interpreter VM is a traditional bytecode interpreter. Cog does just-in-time (JIT) compilation to native code for faster execution. Spur is a new memory model which simplifies object layouts and is common between 32 and 64 bit memory architectures. Because of object format/layout changes Spur images must be run on a Spur VMs and non-Spur images on a non-Spur VM. You have to match the VM to the object format. As far as I am aware, there is no Spur image for Cuis yet. We need to write a tool to read a current image and write it out in Spur format. Spur code is still evolving rapidly, so writing the image translation has not been a priority for us. Now that Squeak 5.0 is out (the 4.x series used the old format, 5.0 uses Spur) things are probably stable enough that we can get to this. -- One side note is that none of the Cog (JIT) VMs run on ARM Chromebooks under Chrome OS. I don't run Intel, but suspect the JIT is broken there as well. This apparently has to do with the tightening up of code security policies in the Chromium OS. As JIT means writing data, then executing this as code, there is an obvious security hole to be addressed. It appears that there are are/should be rubrics/rules which allow JIT. The V8 JavaScript VM does JIT on ChromeOS. But it takes time to dig through the megabytes of code and docs to get at the details. This is in progress, but there is not much resource (people time) to devote to it. FYI, -KenD

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-rmacnak.1514.mcz
by Eliot Miranda 14 Nov '15

14 Nov '15

Hi Ryan, On Wed, Nov 11, 2015 at 8:50 PM, <commits(a)source.squeak.org> wrote: > > Ryan Macnak uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1514.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-rmacnak.1514 > Author: rmacnak > Time: 11 November 2015, 8:50:09.071 pm > UUID: 8504ecc7-5b6f-42d1-90de-3176997a24f7 > Ancestors: VMMaker.oscog-tpr.1513 > > Initial commit of MIPSEL backend. > Woot! And... > =============== Diff against VMMaker.oscog-tpr.1513 =============== > [deletia] Item was added: > + ----- Method: CogMIPSELCompiler>>concretizeRetN (in category 'generate > machine code - concretize') ----- > + concretizeRetN > + <var: #offset type: #sqInt> > + | offset | > + offset := operands at: 0. > + self machineCodeAt: 0 put: (self jR: RA). > + offset = 0 > + ifTrue: [self machineCodeAt: 4 put: self nop "Delay slot"] > + ifFalse: [self machineCodeAt: 4 put: (self addiuR: SP R: > SP C: offset) "We actually get to fill a delay slot!!"]. > + ^machineCodeSize := 8! > I well remember trying to dil;l delay slots in the VW code generator. I suspect there's a reason why so few have them any more :-) _,,,^..^,,,_ best, Eliot

4 4

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2015