Vm-dev November 2021

vm-dev@lists.squeakfoundation.org

11 participants
54 discussions

VM Maker: Cog-eem.449.mcz
by commits＠source.squeak.org 22 Nov '21

22 Nov '21

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.449.mcz ==================== Summary ==================== Name: Cog-eem.449 Author: eem Time: 21 November 2021, 3:35:53.787163 pm UUID: 832345bc-bd98-49ae-916d-5e283ea9548b Ancestors: Cog-eem.448 CogProcessorAliens: fix several memory accesses missing the memoryOffset. All four ISAs once again simulate Spur images correctly. =============== Diff against Cog-eem.448 =============== Item was changed: ----- Method: BochsIA32Alien>>abiMarshalArg0:arg1:in: (in category 'accessing-abstract') ----- abiMarshalArg0: arg0 arg1: arg1 in: memory "Marshal two integral arguments according to the ABI. Currently used only on processors that do ceFlushICache in machine code. CogICacheFlushingIA32Compiler does just this." + self pushWord: arg1 in: memory. + self pushWord: arg0 in: memory! - self push: arg1. - self push: arg0! Item was changed: ----- Method: BochsIA32Alien>>handleExecutionPrimitiveFailureIn:minimumAddress: (in category 'error handling') ----- handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "Handle an execution primitive failure. Convert out-of-range call and absolute memory read into register instructions into ProcessorSimulationTrap signals." "self printIntegerRegistersOn: Transcript" "self printRegistersOn: Transcript" + | memoryOffset pc opcode | + memoryOffset := self primitiveMemoryOffset. + ((pc := self eip) between: minimumAddress and: memoryArray byteSize + memoryOffset - 1) ifTrue: + [opcode := memoryArray byteAt: pc + 1 - memoryOffset. - | pc opcode | - ((pc := self eip) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: - [opcode := memoryArray byteAt: pc + 1 - self primitiveMemoryOffset. opcode ~= 16r0f ifTrue: [^self perform: (OpcodeExceptionMap at: opcode + 1) with: pc with: memoryArray]. + opcode := memoryArray byteAt: pc + 2 - memoryOffset. - opcode := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset. ^self perform: (ExtendedOpcodeExceptionMap at: opcode + 1) with: pc with: memoryArray]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsIA32Alien>>handleMovEbGbFailureAt:in: (in category 'error handling') ----- handleMovEbGbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." + | memoryOffset modrmByte address | + memoryOffset := self primitiveMemoryOffset. + modrmByte := memoryArray byteAt: pc + 2 - memoryOffset. - | modrmByte address | - modrmByte := memoryArray byteAt: pc + 2. (modrmByte bitAnd: 7) ~= 4 ifTrue: "MoveRMbr with r = ESP requires an SIB byte" [address := (modrmByte bitAnd: 16rC0) caseOf: { [0 "ModRegInd"] + -> [memoryArray unsignedLongAt: pc + 3 - memoryOffset]. - -> [memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset]. [16r80 "ModRegRegDisp32"] -> [(self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) + + (memoryArray unsignedLongAt: pc + 3 - memoryOffset) - + (memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset) bitAnd: 16rFFFFFFFF] } otherwise: [^self reportPrimitiveFailure]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 6 address: address type: #write accessor: (#(al cl dl bl ah ch dh bh) at: ((modrmByte >> 3 bitAnd: 7) + 1))) signal]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsIA32Alien>>handleMovEvGvFailureAt:in: (in category 'error handling') ----- handleMovEvGvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a register write into a ProcessorSimulationTrap signal." + | memoryOffset modrmByte | + memoryOffset := self primitiveMemoryOffset. + ^((modrmByte := memoryArray byteAt: pc + 2 - memoryOffset) bitAnd: 16rC7) = 16r5 "ModRegInd & disp32" - | modrmByte | - ^((modrmByte := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset) bitAnd: 16rC7) = 16r5 "ModRegInd & disp32" ifTrue: [(ProcessorSimulationTrap pc: pc nextpc: pc + 6 + address: (memoryArray unsignedLongAt: pc + 3 - memoryOffset) - address: (memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset) type: #write accessor: (#(eax ecx edx ebx esp ebp esi edi) at: ((modrmByte >> 3 bitAnd: 7) + 1))) signal] ifFalse: [self reportPrimitiveFailure]! Item was changed: ----- Method: BochsIA32Alien>>handleMovGbEbFailureAt:in: (in category 'error handling') ----- handleMovGbEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a byte register load into a ProcessorSimulationTrap signal." + | memoryOffset modrmByte address | + memoryOffset := self primitiveMemoryOffset. + modrmByte := memoryArray byteAt: pc + 2 - memoryOffset. - | modrmByte address | - modrmByte := memoryArray byteAt: pc + 2. address := (modrmByte bitAnd: 16rC0) caseOf: { [0 "ModRegInd"] + -> [memoryArray unsignedLongAt: pc + 3 - memoryOffset]. - -> [memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset]. [16r80 "ModRegRegDisp32"] -> [(self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) + + (memoryArray unsignedLongAt: pc + 3 - memoryOffset) - + (memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset) bitAnd: 16rFFFFFFFF] } otherwise: [^self reportPrimitiveFailure]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 6 address: address type: #read accessor: (#(al: cl: dl: bl: ah: ch: dh: bh:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) signal! Item was changed: ----- Method: BochsIA32Alien>>handleMovGvEbFailureAt:in: (in category 'error handling') ----- handleMovGvEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a register load into a ProcessorSimulationTrap signal." + | memoryOffset modrmByte mode srcIsSP srcVal dst offset | + memoryOffset := self primitiveMemoryOffset. + modrmByte := memoryArray byteAt: pc + 3 - memoryOffset. - | modrmByte mode srcIsSP srcVal dst offset | - modrmByte := memoryArray byteAt: pc + 3. mode := modrmByte >> 6 bitAnd: 3. dst := #(eax: ecx: edx: ebx: esp: ebp: esi: edi:) at: ((modrmByte >> 3 bitAnd: 7) + 1). mode = 0 ifTrue: "ModRegInd" + [offset := memoryArray unsignedLongAt: pc + 4 - memoryOffset. "1-relative" - [offset := memoryArray unsignedLongAt: pc + 4 - self primitiveMemoryOffset. "1-relative" ^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 address: offset type: #read accessor: dst) signal]. srcIsSP := (modrmByte bitAnd: 7) = 4. srcVal := self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1). mode = 1 ifTrue: "ModRegRegDisp8" + [offset := memoryArray byteAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - memoryOffset). - [offset := memoryArray byteAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - self primitiveMemoryOffset). offset > 127 ifTrue: [offset := offset - 256]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + (srcIsSP ifTrue: [5] ifFalse: [4]) address: (srcVal + offset bitAnd: 16rFFFFFFFF) type: #read accessor: dst) signal]. mode = 2 ifTrue: "ModRegRegDisp32" + [offset := memoryArray unsignedLongAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - memoryOffset). - [offset := memoryArray unsignedLongAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - self primitiveMemoryOffset). ^(ProcessorSimulationTrap pc: pc nextpc: pc + (srcIsSP ifTrue: [8] ifFalse: [7]) address: (srcVal + offset bitAnd: 16rFFFFFFFF) type: #read accessor: dst) signal]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsIA32Alien>>handleMovGvEvFailureAt:in: (in category 'error handling') ----- handleMovGvEvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a register load into a ProcessorSimulationTrap signal." + | memoryOffset modrmByte | + memoryOffset := self primitiveMemoryOffset. + ^(((modrmByte := memoryArray byteAt: pc + 2 - memoryOffset) bitAnd: 16rC7) = 16r5) "ModRegInd & disp32" - | modrmByte | - ^(((modrmByte := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset) bitAnd: 16rC7) = 16r5) "ModRegInd & disp32" ifTrue: [(ProcessorSimulationTrap pc: pc nextpc: pc + 6 + address: (memoryArray unsignedLongAt: pc + 3 - memoryOffset) - address: (memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset) type: #read accessor: (#(eax: ecx: edx: ebx: esp: ebp: esi: edi:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) signal] ifFalse: [self reportPrimitiveFailure]! Item was changed: ----- Method: BochsIA32Alien>>postCallArgumentsNumArgs:in: (in category 'execution') ----- postCallArgumentsNumArgs: numArgs "<Integer>" in: memory "<ByteArray|Bitmap>" "Answer an argument vector of the requested size after a vanilla ABI call. On IA32 this typically means accessing stacked arguments beyond the pushed return address and saved frame pointer. For compatibility with Cog/Slang we answer unsigned values." + | memoryOffset | + memoryOffset := self ebp - self primitiveMemoryOffset. ^(9 to: numArgs * 4 + 5 by: 4) collect: [:i| + memory unsignedLongAt: memoryOffset + i]! - memory unsignedLongAt: self ebp + i bigEndian: false]! Item was changed: ----- Method: BochsX64Alien>>handleExecutionPrimitiveFailureIn:minimumAddress: (in category 'error handling') ----- handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "Handle an execution primitive failure. Convert out-of-range call and absolute memory read into register instructions into ProcessorSimulationTrap signals." "self printIntegerRegistersOn: Transcript" "self printRegistersOn: Transcript" + | memoryOffset pc opcode rexByteOrNil | + memoryOffset := self primitiveMemoryOffset. + ((pc := self rip) between: minimumAddress and: memoryArray byteSize + memoryOffset - 1) ifTrue: + [opcode := memoryArray byteAt: pc + 1 - memoryOffset. - | pc opcode rexByteOrNil | - ((pc := self rip) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: - [opcode := memoryArray byteAt: pc + 1 - self primitiveMemoryOffset. (opcode bitAnd: 16rF8) = self rexPrefix ifTrue: "skip rex prefix if present" [rexByteOrNil := opcode. + opcode := memoryArray byteAt: pc + 2 - memoryOffset]. - opcode := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset]. ^self perform: (OpcodeExceptionMap at: opcode + 1) with: pc with: memoryArray with: rexByteOrNil]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsX64Alien>>handleGroup6through10FailureAt:in:rex: (in category 'error handling') ----- handleGroup6through10FailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a group 6 instruction into the relevant ProcessorSimulationTrap signal." + | memoryOffset rexByte modrmByte baseReg srcReg | + memoryOffset := self primitiveMemoryOffset. + (((rexByte := memoryArray byteAt: pc + 2 - memoryOffset) bitAnd: 16rF8) = self rexPrefix + and: [(memoryArray byteAt: pc + 3 - memoryOffset) = 16r0F + and: [(memoryArray byteAt: pc + 4 - memoryOffset) = 16rB1]]) ifTrue: + [modrmByte := memoryArray byteAt: pc + 5 - memoryOffset. - | rexByte modrmByte baseReg srcReg | - (((rexByte := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset) bitAnd: 16rF8) = self rexPrefix - and: [(memoryArray byteAt: pc + 3 - self primitiveMemoryOffset) = 16r0F - and: [(memoryArray byteAt: pc + 4 - self primitiveMemoryOffset) = 16rB1]]) ifTrue: - [modrmByte := memoryArray byteAt: pc + 5 - self primitiveMemoryOffset. modrmByte >> 6 = 0 ifTrue: "ModRegInd" [srcReg := (modrmByte >> 3 bitAnd: 7) + ((rexByte bitAnd: 4) bitShift: 1). baseReg := (modrmByte bitAnd: 7) + ((rexByte bitAnd: 1) bitShift: 3). ^(CompareAndSwapSimulationTrap pc: pc nextpc: pc + 5 address: (self perform: (self registerStateGetters at: baseReg + 1)) type: #write accessor: (self registerStateSetters at: srcReg + 1)) failedComparisonRegisterAccessor: #rax:; expectedValue: self rax; storedValue: (self perform: (self registerStateGetters at: srcReg + 1)); signal]]. self reportPrimitiveFailure! Item was changed: ----- Method: BochsX64Alien>>handleMovEbGbFailureAt:in:rex: (in category 'error handling') ----- handleMovEbGbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." + | memoryOffset modrmByte offset size baseReg srcReg | + memoryOffset := self primitiveMemoryOffset. + modrmByte := memoryArray byteAt: pc + 3 - memoryOffset. - | modrmByte offset size baseReg srcReg | - modrmByte := memoryArray byteAt: pc + 3. (modrmByte bitAnd: 16rC0) caseOf: { + [16r80 "ModRegRegDisp32"] -> [offset := memoryArray unsignedLongAt: pc + 4 - memoryOffset. - [16r80 "ModRegRegDisp32"] -> [offset := memoryArray unsignedLongAt: pc + 4 - self primitiveMemoryOffset. size := 7]. + [16r40 "ModRegRegDisp8"] -> [offset := memoryArray byteAt: pc + 4 - memoryOffset. - [16r40 "ModRegRegDisp8"] -> [offset := memoryArray byteAt: pc + 4 - self primitiveMemoryOffset. offset > 127 ifTrue: [offset := offset - 256]. size := 4]. [16r0 "ModRegInd"] -> [offset := 0. size := 3]} otherwise: [self reportPrimitiveFailure]. srcReg := (modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) bitShift: 1). baseReg := (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) bitShift: 3). ^(ProcessorSimulationTrap pc: pc nextpc: pc + size address: (((self perform: (self registerStateGetters at: baseReg + 1)) + offset) bitAnd: 16rFFFFFFFFFFFFFFFF) type: #write accessor: (#(al cl dl bl spl bpl sil dil r8l r9l r10l r11l r12l r13l r14l r15l) at: srcReg + 1)) signal! Item was changed: ----- Method: BochsX64Alien>>handleMovEvGvFailureAt:in:rex: (in category 'error handling') ----- handleMovEvGvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a register write into a ProcessorSimulationTrap signal." + | memoryOffset modrmByte getter base offset | + memoryOffset := self primitiveMemoryOffset. - | modrmByte getter base offset | self assert: rexByteOrNil notNil. + modrmByte := memoryArray byteAt: pc + 3 - memoryOffset. - modrmByte := memoryArray byteAt: pc + 3 - self primitiveMemoryOffset. getter := self registerStateGetters at: (modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) << 1) + 1. (modrmByte bitAnd: 16rC7) = 16r5 ifTrue: "ModRegInd & disp32" [^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 + address: (memoryArray unsignedLongAt: pc + 4 - memoryOffset) - address: (memoryArray unsignedLongAt: pc + 4 - self primitiveMemoryOffset) type: #write accessor: getter) signal]. (modrmByte bitAnd: 16rC0) = 0 ifTrue: "ModRegInd" [base := self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 3 address: (self perform: base) type: #write accessor: getter) signal]. (modrmByte bitAnd: 16rC0) = 16r80 ifTrue: "ModRegRegDisp32" + [offset := memoryArray longAt: pc + 4 - memoryOffset. - [offset := memoryArray longAt: pc + 4 - self primitiveMemoryOffset. base := self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 address: (self perform: base) + offset type: #write accessor: getter) signal]. (modrmByte bitAnd: 16rC0) = 16r40 ifTrue: "ModRegRegDisp8" + [offset := memoryArray unsignedByteAt: pc + 4 - memoryOffset. - [offset := memoryArray unsignedByteAt: pc + 4 - self primitiveMemoryOffset. offset > 127 ifTrue: [offset := offset - 256]. base := self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: (self perform: base) + offset type: #write accessor: getter) signal]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsX64Alien>>handleMovGbEbFailureAt:in:rex: (in category 'error handling') ----- handleMovGbEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a byte register load into a ProcessorSimulationTrap signal." + | memoryOffset modrmByte offset size | + memoryOffset := self primitiveMemoryOffset. + modrmByte := memoryArray byteAt: pc + 3 - memoryOffset. - | modrmByte offset size | - modrmByte := memoryArray byteAt: pc + 3 - self primitiveMemoryOffset. (modrmByte bitAnd: 16rC0) caseOf: { + [16r80 "ModRegRegDisp32"] -> [offset := memoryArray unsignedLongAt: pc + 4 - memoryOffset. - [16r80 "ModRegRegDisp32"] -> [offset := memoryArray unsignedLongAt: pc + 4 - self primitiveMemoryOffset. size := 7]. + [16r40 "ModRegRegDisp8"] -> [offset := memoryArray byteAt: pc + 4 - memoryOffset. - [16r40 "ModRegRegDisp8"] -> [offset := memoryArray byteAt: pc + 4. offset > 127 ifTrue: [offset := offset - 256]. size := 4] } otherwise: [self reportPrimitiveFailure]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + size address: (((self perform: (self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) bitShift: 3) + 1)) + offset) bitAnd: 16rFFFFFFFFFFFFFFFF) type: #read accessor: (#(al: cl: dl: bl: spl: bpl: sil: dil: r8l: r9l: r10l: r11l: r12l: r13l: r14l: r15l:) at: ((modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) bitShift: 1) + 1))) signal! Item was changed: ----- Method: BochsX64Alien>>handleMovGvEbFailureAt:in:rex: (in category 'error handling') ----- handleMovGvEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a register load into a ProcessorSimulationTrap signal." + | memoryOffset modrmByte mode srcIsSP srcVal dst offset | - | modrmByte mode srcIsSP srcVal dst offset | self shouldBeImplemented. + memoryOffset := self primitiveMemoryOffset. + modrmByte := memoryArray byteAt: pc + 3 - memoryOffset. - modrmByte := memoryArray byteAt: pc + 3. mode := modrmByte >> 6 bitAnd: 3. srcIsSP := (modrmByte bitAnd: 7) = 4. srcVal := self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1). dst := #(eax: ecx: edx: ebx: esp: ebp: esi: edi:) at: ((modrmByte >> 3 bitAnd: 7) + 1). mode = 1 ifTrue: "ModRegRegDisp8" + [offset := memoryArray byteAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - memoryOffset). - [offset := memoryArray byteAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - self primitiveMemoryOffset). offset > 127 ifTrue: [offset := offset - 256]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + (srcIsSP ifTrue: [5] ifFalse: [4]) address: ((srcVal + offset) bitAnd: 16rFFFFFFFF) type: #read accessor: dst) signal]. mode = 2 ifTrue: "ModRegRegDisp32" + [offset := memoryArray unsignedLongAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - memoryOffset). - [offset := memoryArray unsignedLongAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - self primitiveMemoryOffset). ^(ProcessorSimulationTrap pc: pc nextpc: pc + (srcIsSP ifTrue: [8] ifFalse: [7]) address: ((srcVal + offset) bitAnd: 16rFFFFFFFF) type: #read accessor: dst) signal]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsX64Alien>>handleMovGvEvFailureAt:in:rex: (in category 'error handling') ----- handleMovGvEvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a register load into a ProcessorSimulationTrap signal." + | memoryOffset modrmByte getter setter offset | - | modrmByte getter setter offset | self assert: rexByteOrNil notNil. + memoryOffset := self primitiveMemoryOffset. + modrmByte := memoryArray byteAt: pc + 3 - memoryOffset. - modrmByte := memoryArray byteAt: pc + 3 - self primitiveMemoryOffset. setter := self registerStateSetters at: ((modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) << 1) + 1). (modrmByte bitAnd: 16rC7) = 16r5 ifTrue: "ModRegInd & disp32" [^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 + address: (memoryArray unsignedLongAt: pc + 4 - memoryOffset) - address: (memoryArray unsignedLongAt: pc + 4 - self primitiveMemoryOffset) type: #read accessor: setter) signal]. getter := self registerStateGetters at: ((modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1). (modrmByte bitAnd: 16rC0) = 16r80 ifTrue: "ModRegRegDisp32" + [offset := memoryArray longAt: pc + 4 - memoryOffset. - [offset := memoryArray longAt: pc + 4 - self primitiveMemoryOffset. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 address: (self perform: getter) + offset type: #read accessor: setter) signal]. (modrmByte bitAnd: 16rC0) = 16r40 ifTrue: "ModRegRegDisp8" + [offset := memoryArray byteAt: pc + 4 - memoryOffset. - [offset := memoryArray byteAt: pc + 4 - self primitiveMemoryOffset. offset > 16r7F ifTrue: [offset := offset - 16r100]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: (self perform: getter) + offset type: #read accessor: setter) signal]. (modrmByte bitAnd: 16rC0) = 16r00 ifTrue: "ModRegInd" [^(ProcessorSimulationTrap pc: pc nextpc: pc + 3 address: (self perform: getter) type: #read accessor: setter) signal]. ^self reportPrimitiveFailure! 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" + | pcOnEntry pc memoryOffset instr | - | pcOnEntry pc instr | pc := pcOnEntry := self pc. self endCondition = InstructionPrefetchError ifTrue: [pc := self pc: self priorPc]. + memoryOffset := self primitiveMemoryOffset. - (pc between: minimumAddress and: memoryArray byteSize - 1) ifTrue: - [instr := memoryArray unsignedLongAt: pc + 1 - self primitiveMemoryOffset. + (pc between: minimumAddress and: memoryArray byteSize + memoryOffset - 1) ifTrue: + [instr := memoryArray unsignedLongAt: pc + 1 - memoryOffset. + (self endCondition = InstructionPrefetchError) ifTrue: [^self handleFailingBranch: instr to: pcOnEntry at: pc]. (self instructionIsAnyLoadStore: instr) ifTrue: [^self handleFailingLoadStore: instr at: pc]. (self instructionIsAnyFPArithmetic: instr) ifTrue: [^self handleFailingFPArithmetic: instr at: pc]. ^self handleExecutionPrimitiveFailureAt: pc in: memoryArray]. ^self reportPrimitiveFailure! Item was changed: ----- Method: GdbARMAlien>>handleExecutionPrimitiveFailureIn:minimumAddress:code: (in category 'error handling') ----- handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>"code: errorCode "<Integer>" "Handle an execution primitive failure. Convert out-of-range call and absolute memory read into register instructions into ProcessorSimulationTrap signals." "self printRegistersOn: Transcript" + | pcOnEntry pc memoryOffset instr | - | pcOnEntry pc instr | pc := pcOnEntry := self pc. errorCode = InstructionPrefetchError ifTrue: [pc := self pc: self priorPc]. + memoryOffset := self primitiveMemoryOffset. - (pc between: minimumAddress and: memoryArray byteSize - 1) ifTrue: - [instr := memoryArray unsignedLongAt: pc + 1 - self primitiveMemoryOffset. + (pc between: minimumAddress and: memoryArray byteSize + memoryOffset - 1) ifTrue: + [instr := memoryArray unsignedLongAt: pc + 1 - memoryOffset. + errorCode = InstructionPrefetchError ifTrue: [^self handleFailingBranch: instr to: pcOnEntry at: pc]. (self instructionIsAnyLoadStore: instr) ifTrue: [^self handleFailingLoadStore: instr at: pc]. (self instructionIsAnyFPArithmetic: instr) ifTrue: [^self handleFailingFPArithmetic: instr at: pc]]. ^self reportPrimitiveFailure!

1 0

VM Maker: VMMaker.oscog-eem.3107.mcz
by commits＠source.squeak.org 21 Nov '21

21 Nov '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3107.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3107 Author: eem Time: 21 November 2021, 1:39:08.900085 pm UUID: c238edb9-02dd-4085-8e56-ef88927e16d0 Ancestors: VMMaker.oscog-eem.3106 Cog simulation: Commit up-to-date surrogate accessors; mostly deletions. =============== Diff against VMMaker.oscog-eem.3106 =============== Item was removed: - ----- Method: CogMethodSurrogate32>>cbUsesInstVars (in category 'accessing generated') ----- - cbUsesInstVars - <bitPosition: 17 width: 1> - ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogMethodSurrogate32>>cbUsesInstVars: (in category 'accessing generated') ----- - cbUsesInstVars: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0])). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate32>>cmHasMovableLiteral (in category 'accessing generated') ----- - cmHasMovableLiteral - <bitPosition: 18 width: 1> - ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -2) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogMethodSurrogate32>>cmHasMovableLiteral: (in category 'accessing generated') ----- - cmHasMovableLiteral: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0])). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate32>>cmNumArgs (in category 'accessing generated') ----- - cmNumArgs - <bitPosition: 0 width: 8> - ^objectMemory byteAt: address + baseHeaderSize! Item was removed: - ----- Method: CogMethodSurrogate32>>cmNumArgs: (in category 'accessing generated') ----- - cmNumArgs: aValue - - | index delta | - index := address + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: aValue]. - ^objectMemory - byteAt: index - put: aValue! Item was removed: - ----- Method: CogMethodSurrogate32>>cmRefersToYoung (in category 'accessing generated') ----- - cmRefersToYoung - <bitPosition: 11 width: 1> - ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -3) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogMethodSurrogate32>>cmRefersToYoung: (in category 'accessing generated') ----- - cmRefersToYoung: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0])). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate32>>cmType (in category 'accessing generated') ----- - cmType - <bitPosition: 8 width: 3> - ^(objectMemory byteAt: address + 1 + baseHeaderSize) bitAnd: 16r7! Item was removed: - ----- Method: CogMethodSurrogate32>>cmType: (in category 'accessing generated') ----- - cmType: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - self assert: (aValue between: 0 and: 16r7). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: ((objectMemory byteAt: index - delta) bitAnd: 16rF8) + aValue]. - objectMemory - byteAt: index - put: ((objectMemory byteAt: index) bitAnd: 16rF8) + aValue. - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate32>>cmUsageCount (in category 'accessing generated') ----- - cmUsageCount - <bitPosition: 13 width: 3> - ^((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -5) bitAnd: 16r7! Item was removed: - ----- Method: CogMethodSurrogate32>>cmUsageCount: (in category 'accessing generated') ----- - cmUsageCount: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - self assert: (aValue between: 0 and: 16r7). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: ((objectMemory byteAt: index - delta) bitAnd: 16r1F) + (aValue bitShift: 5)]. - objectMemory - byteAt: index - put: ((objectMemory byteAt: index) bitAnd: 16r1F) + (aValue bitShift: 5). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate32>>cmUsesPenultimateLit (in category 'accessing generated') ----- - cmUsesPenultimateLit - <bitPosition: 16 width: 1> - ^((objectMemory byteAt: address + 2 + baseHeaderSize) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogMethodSurrogate32>>cmUsesPenultimateLit: (in category 'accessing generated') ----- - cmUsesPenultimateLit: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0])). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate32>>cpicHasMNUCaseOrCMIsFullBlock (in category 'accessing generated') ----- - cpicHasMNUCaseOrCMIsFullBlock - <bitPosition: 12 width: 1> - ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -4) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogMethodSurrogate32>>cpicHasMNUCaseOrCMIsFullBlock: (in category 'accessing generated') ----- - cpicHasMNUCaseOrCMIsFullBlock: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0])). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate32>>stackCheckOffset (in category 'accessing generated') ----- - stackCheckOffset - <bitPosition: 20 width: 12> - ^((objectMemory shortAt: address + 2 + baseHeaderSize) bitShift: -4) bitAnd: 16rFFF! Item was removed: - ----- Method: CogMethodSurrogate32>>stackCheckOffset: (in category 'accessing generated') ----- - stackCheckOffset: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - self assert: (aValue between: 0 and: 16rFFF). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - shortAt: index - delta - put: ((objectMemory shortAt: index - delta) bitAnd: 16rF) + (aValue bitShift: 4)]. - objectMemory - shortAt: index - put: ((objectMemory shortAt: index) bitAnd: 16rF) + (aValue bitShift: 4). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate64>>cbUsesInstVars (in category 'accessing generated') ----- - cbUsesInstVars - <bitPosition: 17 width: 1> - ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogMethodSurrogate64>>cbUsesInstVars: (in category 'accessing generated') ----- - cbUsesInstVars: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0])). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate64>>cmHasMovableLiteral (in category 'accessing generated') ----- - cmHasMovableLiteral - <bitPosition: 18 width: 1> - ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -2) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogMethodSurrogate64>>cmHasMovableLiteral: (in category 'accessing generated') ----- - cmHasMovableLiteral: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0])). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate64>>cmNumArgs (in category 'accessing generated') ----- - cmNumArgs - <bitPosition: 0 width: 8> - ^objectMemory byteAt: address + baseHeaderSize! Item was removed: - ----- Method: CogMethodSurrogate64>>cmNumArgs: (in category 'accessing generated') ----- - cmNumArgs: aValue - - | index delta | - index := address + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: aValue]. - ^objectMemory - byteAt: index - put: aValue! Item was removed: - ----- Method: CogMethodSurrogate64>>cmRefersToYoung (in category 'accessing generated') ----- - cmRefersToYoung - <bitPosition: 11 width: 1> - ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -3) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogMethodSurrogate64>>cmRefersToYoung: (in category 'accessing generated') ----- - cmRefersToYoung: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0])). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate64>>cmType (in category 'accessing generated') ----- - cmType - <bitPosition: 8 width: 3> - ^(objectMemory byteAt: address + 1 + baseHeaderSize) bitAnd: 16r7! Item was removed: - ----- Method: CogMethodSurrogate64>>cmType: (in category 'accessing generated') ----- - cmType: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - self assert: (aValue between: 0 and: 16r7). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: ((objectMemory byteAt: index - delta) bitAnd: 16rF8) + aValue]. - objectMemory - byteAt: index - put: ((objectMemory byteAt: index) bitAnd: 16rF8) + aValue. - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate64>>cmUsageCount (in category 'accessing generated') ----- - cmUsageCount - <bitPosition: 13 width: 3> - ^((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -5) bitAnd: 16r7! Item was removed: - ----- Method: CogMethodSurrogate64>>cmUsageCount: (in category 'accessing generated') ----- - cmUsageCount: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - self assert: (aValue between: 0 and: 16r7). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: ((objectMemory byteAt: index - delta) bitAnd: 16r1F) + (aValue bitShift: 5)]. - objectMemory - byteAt: index - put: ((objectMemory byteAt: index) bitAnd: 16r1F) + (aValue bitShift: 5). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate64>>cmUsesPenultimateLit (in category 'accessing generated') ----- - cmUsesPenultimateLit - <bitPosition: 16 width: 1> - ^((objectMemory byteAt: address + 2 + baseHeaderSize) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogMethodSurrogate64>>cmUsesPenultimateLit: (in category 'accessing generated') ----- - cmUsesPenultimateLit: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0])). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate64>>cpicHasMNUCaseOrCMIsFullBlock (in category 'accessing generated') ----- - cpicHasMNUCaseOrCMIsFullBlock - <bitPosition: 12 width: 1> - ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -4) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogMethodSurrogate64>>cpicHasMNUCaseOrCMIsFullBlock: (in category 'accessing generated') ----- - cpicHasMNUCaseOrCMIsFullBlock: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0])). - ^aValue! Item was removed: - ----- Method: CogMethodSurrogate64>>stackCheckOffset (in category 'accessing generated') ----- - stackCheckOffset - <bitPosition: 20 width: 12> - ^((objectMemory shortAt: address + 2 + baseHeaderSize) bitShift: -4) bitAnd: 16rFFF! Item was removed: - ----- Method: CogMethodSurrogate64>>stackCheckOffset: (in category 'accessing generated') ----- - stackCheckOffset: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - self assert: (aValue between: 0 and: 16rFFF). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - shortAt: index - delta - put: ((objectMemory shortAt: index - delta) bitAnd: 16rF) + (aValue bitShift: 4)]. - objectMemory - shortAt: index - put: ((objectMemory shortAt: index) bitAnd: 16rF) + (aValue bitShift: 4). - ^aValue! Item was changed: ----- Method: CogNewspeakMethodSurrogate32>>nextMethodOrIRCs: (in category 'accessing generated') ----- nextMethodOrIRCs: aValue | index delta | + index := address + 20 + baseHeaderSize. - index := address + baseHeaderSize + 20. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). objectMemory + long32At: index - delta + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))]. - longAt: index - delta - put: aValue]. ^objectMemory + long32At: index + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))! - longAt: index - put: aValue! Item was changed: ----- Method: CogNewspeakMethodSurrogate64>>nextMethodOrIRCs: (in category 'accessing generated') ----- nextMethodOrIRCs: aValue | index delta | + index := address + 32 + baseHeaderSize. - index := address + baseHeaderSize + 32. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). objectMemory long64At: index - delta + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))]. - put: aValue]. ^objectMemory long64At: index + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))! - put: aValue! Item was changed: ----- Method: CogSistaMethodSurrogate32>>counters: (in category 'accessing generated') ----- counters: aValue | index delta | index := address + 20 + baseHeaderSize. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). objectMemory long32At: index - delta + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))]. - put: aValue]. ^objectMemory long32At: index + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))! - put: aValue! Item was changed: ----- Method: CogSistaMethodSurrogate64>>counters: (in category 'accessing generated') ----- counters: aValue | index delta | index := address + 32 + baseHeaderSize. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). objectMemory long64At: index - delta + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))]. - put: aValue]. ^objectMemory long64At: index + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))! - put: aValue!

1 0

VM Maker: VMMaker.oscog-eem.3106.mcz
by commits＠source.squeak.org 21 Nov '21

21 Nov '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3106.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3106 Author: eem Time: 21 November 2021, 1:15:47.346356 pm UUID: 48aa5b30-dd80-47f2-b35d-f998790ac7ab Ancestors: VMMaker.oscog-eem.3105 Cog simulation: Make sure the range assert is not generated in boolean surrogate setters. Nuke the two obsolete setter generators. =============== Diff against VMMaker.oscog-eem.3105 =============== Item was removed: - ----- Method: CogBlockMethod class>>setter:bitPosition:bitWidth:type: (in category 'code generation') ----- - setter: getter bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil - ^String streamContents: - [:s| | startByte endByte shift alignedPowerOf2 accessor mask | - startByte := bitPosition // 8. - endByte := bitPosition + bitWidth - 1 // 8. - shift := bitPosition \\ 8. - alignedPowerOf2 := (#(8 16 32 64) includes: bitWidth) and: [shift = 0]. - accessor := 'unsigned' - , (#('Byte' 'Short' 'Long' 'Long') - at: endByte - startByte + 1 - ifAbsent: ['Long64']) - , 'At: index'. - mask := #(16rFF 16rFFFF 16rFFFFFFFF 16rFFFFFFFF) - at: endByte - startByte + 1 - ifAbsent: [(2 raisedTo: 64) - 1]. - s nextPutAll: getter; nextPutAll: ': aValue'; crtab: 1. - s crtab: 1; nextPutAll: '| index delta |'; crtab: 1. - s nextPutAll: 'index := address + '. - (self offsetForInstVar: getter) ifNotNil: - [:offsetExpr| s nextPutAll: offsetExpr, ' + ']. - s print: startByte + 1; nextPut: $.; crtab: 1. - (typeOrNil notNil or: [alignedPowerOf2]) ifFalse: - [s nextPutAll: 'self assert: (aValue between: 0 and: '; nextPutAll: ((1 << bitWidth) - 1) hex; nextPutAll: ').'; crtab: 1]. - s nextPutAll: '(delta := cogit getCodeToDataDelta) > 0 ifTrue:'; crtab: 2. - s nextPutAll: '[self assert: (cogit addressIsInCodeZone: address - delta).'; crtab: 2; space. - self putAtPut: accessor, ' - delta' - type: typeOrNil - mask: (alignedPowerOf2 ifFalse: [mask - ((1 << bitWidth - 1) << shift)]) - shift: shift - on: s - indent: 3. - s nextPutAll: '].'; crtab: 1. - alignedPowerOf2 ifTrue: - [s nextPut: $^]. - self putAtPut: accessor - type: typeOrNil - mask: (alignedPowerOf2 ifFalse: [mask - ((1 << bitWidth - 1) << shift)]) - shift: shift - on: s - indent: 2. - alignedPowerOf2 ifFalse: - [s nextPut: $.; crtab: 1; nextPutAll: '^aValue']]! Item was changed: ----- Method: CogSurrogate class>>setter:offsetExpression:bitPosition:bitWidth:type: (in category 'code generation') ----- setter: getter offsetExpression: offsetExpression bitPosition: bitPosition bitWidth: bitWidth type: type ^String streamContents: [:s| | startByte endByte shift alignedPowerOf2 accessor mask | startByte := bitPosition // 8. endByte := bitPosition + bitWidth - 1 // 8. shift := bitPosition \\ 8. alignedPowerOf2 := shift = 0 and: [#(8 16 32 64) includes: bitWidth]. accessor := (#(byteAt: shortAt: long32At: long64At:) at: (endByte - startByte) highBit + 1), ' index'. mask := (2 raisedTo: endByte - startByte + 1 * 8) - 1. s nextPutAll: getter; nextPutAll: ': aValue'; crtab. s crtab; nextPutAll: '| index delta |'; crtab. s nextPutAll: 'index := address'. startByte > 0 ifTrue: [s nextPutAll: ' + '; print: startByte]. offsetExpression ifNotNil: [s nextPutAll: ' + '; nextPutAll: offsetExpression]. s nextPut: $.; crtab. + (alignedPowerOf2 or: [type == #Boolean]) ifFalse: - alignedPowerOf2 ifFalse: [s nextPutAll: 'self assert: (aValue between: 0 and: '; nextPutAll: ((1 << bitWidth) - 1) hex; nextPutAll: ').'; crtab]. s nextPutAll: '(delta := cogit getCodeToDataDelta) > 0 ifTrue:'; crtab: 2. s nextPutAll: '[self assert: (cogit addressIsInCodeZone: address - delta).'; crtab: 2; space. self putAtPut: accessor, ' - delta' type: type mask: (alignedPowerOf2 ifFalse: [mask - ((1 << bitWidth - 1) << shift)]) shift: shift on: s indent: 3. s nextPutAll: '].'; crtab. alignedPowerOf2 ifTrue: [s nextPut: $^]. self putAtPut: accessor type: type mask: (alignedPowerOf2 ifFalse: [mask - ((1 << bitWidth - 1) << shift)]) shift: shift on: s indent: 2. alignedPowerOf2 ifFalse: [s nextPut: $.; crtab; nextPutAll: '^aValue']]! Item was removed: - ----- Method: VMStructType class>>setter:bitPosition:bitWidth:type: (in category 'code generation') ----- - setter: getter bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil - self shouldNotImplement. "should be under CogSurrogate class" - ^String streamContents: - [:s| | startByte endByte shift indexExpr accessor alignedPowerOf2 mask | - startByte := bitPosition // 8. - endByte := bitPosition + bitWidth - 1 // 8. - shift := bitPosition \\ 8. - s nextPutAll: getter; nextPutAll: ': aValue'; crtab: 1. - indexExpr := 'address + ', - ((self offsetForInstVar: getter) ifNotNil: [:offsetExpr| offsetExpr, ' + '] ifNil: ['']), - (startByte + 1) printString. - accessor := 'unsigned' - , (#('Byte' 'Short' 'Long' 'Long') - at: endByte - startByte + 1 - ifAbsent: ['Long64']) - , 'At: '. - (alignedPowerOf2 := (#(8 16 32 64) includes: bitWidth) and: [shift = 0]) - ifTrue: "index used once; no point using a temp to hold it" - [accessor := accessor, indexExpr] - ifFalse: "index used twice; cache it" - [s nextPutAll: '| index |'; crtab: 1; nextPutAll: 'index := '; nextPutAll: indexExpr; nextPut: $.; crtab: 1. - accessor := accessor, 'index']. - mask := #(16rFF 16rFFFF 16rFFFFFFFF 16rFFFFFFFF) - at: endByte - startByte + 1 - ifAbsent: [(2 raisedTo: 64) - 1]. - (typeOrNil notNil or: [alignedPowerOf2]) ifFalse: - [s nextPutAll: 'self assert: (aValue between: 0 and: '; nextPutAll: ((1 << bitWidth) - 1) hex; nextPutAll: ').'; crtab: 1]. - alignedPowerOf2 ifTrue: - [s nextPut: $^]. - self putAtPut: accessor - type: typeOrNil - mask: (alignedPowerOf2 ifFalse: [mask - ((1 << bitWidth - 1) << shift)]) - shift: shift - on: s - indent: 2. - alignedPowerOf2 ifFalse: - [s nextPut: $.; crtab: 1; nextPutAll: '^aValue']]!

1 0

VM Maker: VMMaker.oscog-eem.3105.mcz
by commits＠source.squeak.org 21 Nov '21

21 Nov '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3105.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3105 Author: eem Time: 21 November 2021, 9:32:38.061647 am UUID: bec73bb3-9a4f-4803-a56e-dcb349eb677b Ancestors: VMMaker.oscog-eem.3104 Cog simulation: No longer hack integral types to nil in the surrogate code generation methods. Have VMStructType class>>#fieldAccessorSourceFor:bytesPerWord: maintain BytesPerWord, making checking easier. =============== Diff against VMMaker.oscog-eem.3104 =============== Item was removed: - ----- Method: CogBlockMethod class>>surrogateClass (in category 'accessing') ----- - surrogateClass - self shouldNotImplement! Item was removed: - ----- Method: CogMethod class>>surrogateClass (in category 'accessing') ----- - surrogateClass - self shouldNotImplement! Item was changed: ----- Method: CogStackPageSurrogate class>>getter:offsetExpression:bitPosition:bitWidth:type: (in category 'code generation') ----- + getter: getter offsetExpression: offsetExpr bitPosition: bitPosition bitWidth: bitWidth type: type - getter: getter offsetExpression: offsetExpr bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil self assert: offsetExpr isNil. ^String streamContents: [:s| | startByte endByte accessor | startByte := bitPosition // 8. endByte := bitPosition + bitWidth - 1 // 8. self assert: bitPosition \\ 8 = 0. self assert: startByte \\ (bitWidth // 8) = 0. accessor := #(byteAt: shortAt: long32At: long64At:) at: (endByte - startByte) highBit + 1. + s nextPutAll: getter; crtab: 1; nextPut: $^. + ('*StackPage*' match: type) ifTrue: + [s nextPutAll: 'stackPages '; nextPutAll: #surrogateAtAddress:; space; nextPut: $(]. + type == #int ifTrue: + [s nextPut: $(]. - s nextPutAll: getter; crtab: 1; nextPut: $^. - typeOrNil ifNotNil: - [('*StackPage*' match: typeOrNil) ifTrue: - [s nextPutAll: 'stackPages surrogateAtAddress: (']. - typeOrNil == #int ifTrue: - [s nextPut: $(]]. s nextPutAll: #objectMemory; space; nextPutAll: accessor; nextPutAll: ' address'. startByte > 0 ifTrue: [s nextPutAll: ' + '; print: startByte]. + ('*StackPage*' match: type) ifTrue: + [s nextPut: $)]. + type == #int ifTrue: + [s nextPut: $); space; nextPutAll: #signedIntFromLong]] - typeOrNil ifNotNil: - [('*StackPage*' match: typeOrNil) ifTrue: - [s nextPut: $)]. - typeOrNil == #int ifTrue: - [s nextPutAll: ') '; nextPutAll: #signedIntFromLong]]] "| bitPosition | bitPosition := 0. (CogStackPage fieldAccessorsForBytesPerWord: BytesPerWord) collect: [:spec| bitPosition := bitPosition + spec second. self getter: spec first offsetExpression: nil bitPosition: bitPosition - spec second bitWidth: spec second + type: (spec at: 3)]"! - type: (spec at: 3 ifAbsent: [])]"! Item was changed: ----- Method: CogStackPageSurrogate class>>setter:offsetExpression:bitPosition:bitWidth:type: (in category 'code generation') ----- + setter: getter offsetExpression: offsetExpr bitPosition: bitPosition bitWidth: bitWidth type: type - setter: getter offsetExpression: offsetExpr bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil self assert: offsetExpr isNil. ^String streamContents: [:s| | startByte endByte accessor | startByte := bitPosition // 8. endByte := bitPosition + bitWidth - 1 // 8. self assert: bitPosition \\ 8 = 0. self assert: startByte \\ (bitWidth // 8) = 0. accessor := #(byteAt: shortAt: long32At: long64At:) at: (endByte - startByte) highBit + 1. s nextPutAll: getter; nextPutAll: ': aValue'; crtab: 1; nextPutAll: 'self assert: (address'. startByte > 0 ifTrue: [s nextPutAll: ' + '; print: startByte]. s nextPutAll: ' >= zoneBase and: [address + '; print: endByte; nextPutAll: ' < zoneLimit]).'; crtab: 1. + (type == #int or: ['*StackPage*' match: type]) ifFalse: + [s nextPut: $^]. - typeOrNil ifNotNil: - [(typeOrNil == #int or: ['*StackPage*' match: typeOrNil]) ifFalse: - [s nextPut: $^]]. s nextPutAll: #objectMemory; space; nextPutAll: accessor; nextPutAll: ' address'. startByte > 0 ifTrue: [s nextPutAll: ' + '; print: startByte]. s nextPutAll: ' put: aValue'. + ('*StackPage*' match: type) ifTrue: + [s nextPutAll: ' asInteger.'; crtab; nextPutAll: '^aValue']. + type == #int ifTrue: + [s space; nextPutAll: #signedIntToLong; nextPut: $.; crtab; nextPutAll: '^aValue']] - typeOrNil ifNotNil: - [('*StackPage*' match: typeOrNil) ifTrue: - [s nextPutAll: ' asInteger.'; crtab; nextPutAll: '^aValue']. - typeOrNil == #int ifTrue: - [s space; nextPutAll: #signedIntToLong; nextPut: $.; crtab; nextPutAll: '^aValue']]] "| bitPosition | bitPosition := 0. (CogStackPage fieldAccessorsForBytesPerWord: BytesPerWord) collect: [:spec| bitPosition := bitPosition + spec second. self setter: spec first offsetExpression: nil bitPosition: bitPosition - spec second bitWidth: spec second + type: (spec at: 3)]"! - type: (spec at: 3 ifAbsent: [])]"! Item was changed: ----- Method: CogSurrogate class>>getter:offsetExpression:bitPosition:bitWidth:type: (in category 'code generation') ----- + getter: getter offsetExpression: offsetExpression bitPosition: bitPosition bitWidth: bitWidth type: type - getter: getter offsetExpression: offsetExpression bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil ^String streamContents: [:s| | startByte endByte alignedPowerOf2 shift | startByte := bitPosition // 8. endByte := bitPosition + bitWidth - 1 // 8. shift := bitPosition \\ 8. + alignedPowerOf2 := shift = 0 and: [#(8 16 32 64) includes: bitWidth]. - alignedPowerOf2 := (#(8 16 32 64) includes: bitWidth) and: [shift = 0]. s nextPutAll: getter; crtab. bitWidth < (BytesPerWord * 8) ifTrue: [s nextPut: $<; print: (Message selector: #bitPosition:width: arguments: {bitPosition. bitWidth}); nextPut: $>; crtab]. + type last = $* ifTrue: - (typeOrNil notNil and: [typeOrNil last = $*]) ifTrue: [s nextPutAll: '| v |'; crtab: 1]. s nextPut: $^. + type == #Boolean ifTrue: [s nextPut: $(]. + type last = $* ifTrue: + [s nextPutAll: '(v := ']. - typeOrNil ifNotNil: - [s nextPut: $(. - typeOrNil last = $* ifTrue: - [s nextPutAll: 'v := ']]. alignedPowerOf2 ifFalse: [s nextPut: $(]. shift ~= 0 ifTrue: [s nextPut: $(]. s nextPutAll: #objectMemory; space; nextPutAll: (#(byteAt: shortAt: long32At: long64At:) at: (endByte - startByte) highBit + 1); nextPutAll: ' address'. startByte > 0 ifTrue: [s nextPutAll: ' + '; print: startByte]. offsetExpression ifNotNil: [s nextPutAll: ' + '; nextPutAll: offsetExpression]. shift ~= 0 ifTrue: [s nextPutAll: ') bitShift: -'; print: shift]. alignedPowerOf2 ifFalse: [s nextPutAll: ') bitAnd: '; nextPutAll: ((1 << bitWidth) - 1) hex]. + (type == #Boolean or: [type last = $*]) ifTrue: - typeOrNil ifNotNil: [s nextPutAll: ') ~= 0'. + type last = $* ifTrue: - typeOrNil last = $* ifTrue: [s nextPutAll: ' ifTrue:'; crtab: 2; nextPutAll: '[cogit cCoerceSimple: v to: '; + store: type; - store: typeOrNil; nextPut: $]]]]! Item was changed: ----- Method: CogSurrogate class>>putAtPut:type:mask:shift:on:indent: (in category 'code generation') ----- putAtPut: accessor type: typeOrNil mask: maskOrNil shift: shift on: s indent: indent + "This is the inner part of the at:put: in a setter, abstracted to eliminate duplication - "This is the inner part of the ap:put: in a setter, abstracted to eliminate duplication given the overrides in CogBlockMethod et al for dual zone write simulation." + | isIntegralType | s nextPutAll: #objectMemory; crtab: indent; nextPutAll: accessor; crtab: indent; nextPutAll: 'put: '. + (isIntegralType := CCodeGenerator basicNew isIntegralCType: typeOrNil) ifFalse: - typeOrNil ifNotNil: [s nextPut: $(]. maskOrNil ifNotNil: [s nextPutAll: '((objectMemory '; nextPutAll: accessor; nextPutAll: ') bitAnd: '; nextPutAll: maskOrNil hex; nextPutAll: ') + ']. + s nextPutAll: (isIntegralType + ifTrue: [shift = 0 ifTrue: ['aValue'] ifFalse: ['(aValue bitShift: ', shift printString, ')']] + ifFalse: + [typeOrNil == #Boolean + ifTrue: ['(aValue ifTrue: [', (1 << shift) printString, '] ifFalse: [0]))'] + ifFalse: + ['(aValue ifNotNil: [aValue asUnsignedInteger', (shift = 0 ifTrue: [''] ifFalse: [' bitShift: ', shift printString]), '] ifNil: [0]))']])! - s nextPutAll: (typeOrNil - caseOf: { - [nil] -> [shift = 0 ifTrue: ['aValue'] ifFalse: ['(aValue bitShift: ', shift printString, ')']]. - [#Boolean] -> ['(aValue ifTrue: [', (1 << shift) printString, '] ifFalse: [0])'] } - otherwise: ['(aValue ifNotNil: [aValue asUnsignedInteger', (shift = 0 ifTrue: [''] ifFalse: [' bitShift: ', shift printString]), '] ifNil: [0])']). - typeOrNil ifNotNil: - [s nextPut: $)]! Item was changed: ----- Method: CogSurrogate class>>setter:offsetExpression:bitPosition:bitWidth:type: (in category 'code generation') ----- + setter: getter offsetExpression: offsetExpression bitPosition: bitPosition bitWidth: bitWidth type: type - setter: getter offsetExpression: offsetExpression bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil ^String streamContents: [:s| | startByte endByte shift alignedPowerOf2 accessor mask | startByte := bitPosition // 8. endByte := bitPosition + bitWidth - 1 // 8. shift := bitPosition \\ 8. + alignedPowerOf2 := shift = 0 and: [#(8 16 32 64) includes: bitWidth]. - alignedPowerOf2 := (#(8 16 32 64) includes: bitWidth) and: [shift = 0]. accessor := (#(byteAt: shortAt: long32At: long64At:) at: (endByte - startByte) highBit + 1), ' index'. mask := (2 raisedTo: endByte - startByte + 1 * 8) - 1. + s nextPutAll: getter; nextPutAll: ': aValue'; crtab. + s crtab; nextPutAll: '| index delta |'; crtab. - s nextPutAll: getter; nextPutAll: ': aValue'; crtab: 1. - s crtab: 1; nextPutAll: '| index delta |'; crtab: 1. s nextPutAll: 'index := address'. startByte > 0 ifTrue: [s nextPutAll: ' + '; print: startByte]. offsetExpression ifNotNil: [s nextPutAll: ' + '; nextPutAll: offsetExpression]. + s nextPut: $.; crtab. + alignedPowerOf2 ifFalse: + [s nextPutAll: 'self assert: (aValue between: 0 and: '; nextPutAll: ((1 << bitWidth) - 1) hex; nextPutAll: ').'; crtab]. - s nextPut: $.; crtab: 1. - (typeOrNil notNil or: [alignedPowerOf2]) ifFalse: - [s nextPutAll: 'self assert: (aValue between: 0 and: '; nextPutAll: ((1 << bitWidth) - 1) hex; nextPutAll: ').'; crtab: 1]. s nextPutAll: '(delta := cogit getCodeToDataDelta) > 0 ifTrue:'; crtab: 2. s nextPutAll: '[self assert: (cogit addressIsInCodeZone: address - delta).'; crtab: 2; space. self putAtPut: accessor, ' - delta' + type: type - type: typeOrNil mask: (alignedPowerOf2 ifFalse: [mask - ((1 << bitWidth - 1) << shift)]) shift: shift on: s indent: 3. + s nextPutAll: '].'; crtab. - s nextPutAll: '].'; crtab: 1. alignedPowerOf2 ifTrue: [s nextPut: $^]. self putAtPut: accessor + type: type - type: typeOrNil mask: (alignedPowerOf2 ifFalse: [mask - ((1 << bitWidth - 1) << shift)]) shift: shift on: s indent: 2. alignedPowerOf2 ifFalse: + [s nextPut: $.; crtab; nextPutAll: '^aValue']]! - [s nextPut: $.; crtab: 1; nextPutAll: '^aValue']]! Item was changed: ----- Method: VMStructType class>>checkGenerateSurrogate:bytesPerWord: (in category 'code generation') ----- checkGenerateSurrogate: surrogateClass bytesPerWord: bytesPerWord "Check the accessor methods for the fields of the receiver and if necessary install new or updated versions in the surrogate class alpng with the alignedByteSize class method." "self withAllSubclasses do: [:cogMethodClass| (cogMethodClass class includesSelector: #initialize) ifTrue: [cogMethodClass initialize]]" + "{CogBlockMethod fieldAccessorSourceFor: CogBlockMethodSurrogate32 bytesPerWord: 4. + CogMethod fieldAccessorSourceFor: CogMethodSurrogate32 bytesPerWord: 4. + CogBlockMethod fieldAccessorSourceFor: CogBlockMethodSurrogate64 bytesPerWord: 8. + CogMethod fieldAccessorSourceFor: CogMethodSurrogate64 bytesPerWord: 8. + CogStackPage fieldAccessorSourceFor: CogStackPageSurrogate64 bytesPerWord: 8. + CogStackPage fieldAccessorSourceFor: CogStackPageSurrogate32 bytesPerWord: 4}" + | accessors | + accessors := self fieldAccessorSourceFor: surrogateClass bytesPerWord: bytesPerWord. - "CogBlockMethod checkGenerateSurrogate: CogBlockMethodSurrogate32 bytesPerWord: 4. - CogMethod checkGenerateSurrogate: CogMethodSurrogate32 bytesPerWord: 4. - CogBlockMethod checkGenerateSurrogate: CogBlockMethodSurrogate64 bytesPerWord: 8. - CogMethod checkGenerateSurrogate: CogMethodSurrogate64 bytesPerWord: 8" - | accessors oldBytesPerWord | - oldBytesPerWord := BytesPerWord. - accessors := [self fieldAccessorSourceFor: surrogateClass bytesPerWord: (BytesPerWord := bytesPerWord)] - ensure: [BytesPerWord := oldBytesPerWord]. "All methods which are the same in 32 and 64 bit versions should be compiled in the superclass iff the superclass is not of a specific word size." (self dualForSurrogateClass: surrogateClass) ifNotNil: [:dual| | duals | surrogateClass superclass name last isDigit ifFalse: + [duals := self fieldAccessorSourceFor: dual bytesPerWord: (bytesPerWord = 4 ifTrue: [8] ifFalse: [4]). - [duals := [self fieldAccessorSourceFor: dual bytesPerWord: (BytesPerWord := bytesPerWord = 4 ifTrue: [8] ifFalse: [4])] - ensure: [BytesPerWord := oldBytesPerWord]. (accessors keys select: [:key| (accessors at: key) = (duals at: {key first isMeta ifTrue: [dual class] ifFalse: [dual]. key last} ifAbsent: ['missing'])]) do: [:key| | source class selector | class := key first. selector := key last. source := accessors removeKey: key. (class includesSelector: selector) ifTrue: [class removeSelector: selector]. (class superclass sourceCodeAt: selector ifAbsent: ['']) asString ~= source ifTrue: [class superclass compile: source classified: 'accessing generated']]]]. accessors keysAndValuesDo: [:key :source| | class selector ancestor | class := key first. selector := key last. ((ancestor := class superclass whichClassIncludesSelector: selector) notNil and: [source = (ancestor sourceCodeAt: selector ifAbsent: ['']) asString]) ifTrue: [class removeSelector: selector] ifFalse: [source ~= (class sourceCodeAt: selector ifAbsent: ['']) asString ifTrue: [class compile: source classified: 'accessing generated']]]! Item was added: + ----- Method: VMStructType class>>computeFieldAccessorSourceFor:bytesPerWord: (in category 'code generation') ----- + computeFieldAccessorSourceFor: surrogateClass bytesPerWord: bytesPerWord + "Answer a Dictionary of MethodReference to source for the accessors of the inst vars of the + receiver and the alignedByteSize class method in surrogateClass with the given word size." + + | methods bitPosition alignedByteSize currentOffset | + methods := Dictionary new. + bitPosition := 0. + (self fieldAccessorsForBytesPerWord: bytesPerWord) do: + [:spec| + "reset the bitPosition if the offset expression changes." + currentOffset ~= (self offsetForInstVar: spec first) ifTrue: + [bitPosition := 0. + currentOffset := self offsetForInstVar: spec first]. + spec first ~= #unused ifTrue: + [methods + at: {surrogateClass. spec first asSymbol} + put: (surrogateClass + getter: spec first + offsetExpression: (self offsetForInstVar: spec first) + bitPosition: bitPosition + bitWidth: spec second + type: (spec at: 3)); + at: {surrogateClass. (spec first, ':') asSymbol} + put: (surrogateClass + setter: spec first + offsetExpression: (self offsetForInstVar: spec first) + bitPosition: bitPosition + bitWidth: spec second + type: (spec at: 3))]. + bitPosition := bitPosition + spec second]. + alignedByteSize := (self roundUpBitPosition: bitPosition toWordBoundary: bytesPerWord) / 8. + self assert: alignedByteSize isInteger. + methods + at: {surrogateClass class. #alignedByteSize} + put: #alignedByteSize + , (String with: Character cr with: Character tab with: $^) + , alignedByteSize printString, + (currentOffset ifNil: [''] ifNotNil: [' + self ', currentOffset]). + ^methods! Item was changed: ----- Method: VMStructType class>>fieldAccessorSourceFor:bytesPerWord: (in category 'code generation') ----- fieldAccessorSourceFor: surrogateClass bytesPerWord: bytesPerWord "Answer a Dictionary of MethodReference to source for the accessors of the inst vars of the receiver and the alignedByteSize class method in surrogateClass with the given word size." "{CogBlockMethod fieldAccessorSourceFor: CogBlockMethodSurrogate32 bytesPerWord: 4. CogMethod fieldAccessorSourceFor: CogMethodSurrogate32 bytesPerWord: 4. CogBlockMethod fieldAccessorSourceFor: CogBlockMethodSurrogate64 bytesPerWord: 8. + CogMethod fieldAccessorSourceFor: CogMethodSurrogate64 bytesPerWord: 8. + CogStackPage fieldAccessorSourceFor: CogStackPageSurrogate64 bytesPerWord: 8. + CogStackPage fieldAccessorSourceFor: CogStackPageSurrogate32 bytesPerWord: 4}" + | oldBytesPerWord | + oldBytesPerWord := BytesPerWord. + ^[self computeFieldAccessorSourceFor: surrogateClass bytesPerWord: (BytesPerWord := bytesPerWord)] + ensure: [BytesPerWord := oldBytesPerWord]! - CogMethod fieldAccessorSourceFor: CogMethodSurrogate64 bytesPerWord: 8}" - | methods bitPosition alignedByteSize currentOffset | - methods := Dictionary new. - bitPosition := 0. - (self fieldAccessorsForBytesPerWord: bytesPerWord) do: - [:spec| - "reset the bitPosition if the offset expression changes." - currentOffset ~= (self offsetForInstVar: spec first) ifTrue: - [bitPosition := 0. - currentOffset := self offsetForInstVar: spec first]. - spec first ~= #unused ifTrue: - [methods - at: {surrogateClass. spec first asSymbol} - put: (surrogateClass - getter: spec first - offsetExpression: (self offsetForInstVar: spec first) - bitPosition: bitPosition - bitWidth: spec second - type: (spec at: 3 ifAbsent: [])); - at: {surrogateClass. (spec first, ':') asSymbol} - put: (surrogateClass - setter: spec first - offsetExpression: (self offsetForInstVar: spec first) - bitPosition: bitPosition - bitWidth: spec second - type: (spec at: 3 ifAbsent: []))]. - bitPosition := bitPosition + spec second]. - alignedByteSize := (self roundUpBitPosition: bitPosition toWordBoundary: bytesPerWord) / 8. - self assert: alignedByteSize isInteger. - methods - at: {surrogateClass class. #alignedByteSize} - put: #alignedByteSize - , (String with: Character cr with: Character tab with: $^) - , alignedByteSize printString, - (currentOffset ifNil: [''] ifNotNil: [' + self ', currentOffset]). - ^methods! Item was changed: ----- Method: VMStructType class>>fieldAccessorsForBytesPerWord: (in category 'code generation') ----- fieldAccessorsForBytesPerWord: bytesPerWord | fieldSpecs | fieldSpecs := OrderedCollection new. self instVarNamesAndTypesForTranslationDo: [:ivn :typeTuple| | index replacement | (index := typeTuple indexOf: #BytesPerWord ifAbsent: 0) > 0 ifTrue: [(typeTuple at: index + 1) = bytesPerWord ifTrue: [replacement := typeTuple copyReplaceFrom: index to: index + 1 with: #(). replacement size = 1 ifTrue: [replacement := replacement first]. fieldSpecs add: { ivn. replacement }]] ifFalse: [fieldSpecs add: { ivn. typeTuple }]]. ^fieldSpecs collect: [:tuple| [:ivn :typeTuple| { ('*unused*' match: ivn) ifTrue: [#unused] ifFalse: [ivn]. (typeTuple isArray and: ['unsigned' = typeTuple first]) ifTrue: [Integer readFrom: (typeTuple last readStream skipTo: $:; skipSeparators)] ifFalse: [typeTuple caseOf: { [#char] -> [8]. [#'unsigned char'] -> [8]. [#short] -> [16]. [#'unsigned short'] -> [16]. [#int] -> [32]. [#'unsigned int'] -> [32] } otherwise: [bytesPerWord * 8]]. typeTuple isArray + ifTrue: "bitfields..." + [(typeTuple size >= 3 and: [typeTuple second = #Boolean]) + ifTrue: [#Boolean] + ifFalse: [#unsigned]] + ifFalse: "niormal types..." - ifTrue: - [(typeTuple size >= 3 and: [typeTuple second = #Boolean]) ifTrue: - [#Boolean]] - ifFalse: [(typeTuple last = $* and: [typeTuple beginsWith: 'struct _']) "remove struct tag if any" ifTrue: [(typeTuple allButFirst: 8) asSymbol] ifFalse: [typeTuple]] }] valueWithArguments: tuple] "#(4 8) collect: [:bpw| (CogBlockMethod fieldAccessorsForBytesPerWord: bpw) asArray]" "#(4 8) collect: [:bpw| (CogMethod fieldAccessorsForBytesPerWord: bpw) asArray]"!

1 0

VM Maker: VMMaker.oscog-eem.3104.mcz
by commits＠source.squeak.org 21 Nov '21

21 Nov '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3104.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3104 Author: eem Time: 20 November 2021, 10:34:06.672086 pm UUID: 09dd3ad9-d9df-4efc-bda5-e63d27fbc9e5 Ancestors: VMMaker.oscog-eem.3103 Fix a crash in recursive invocations of primitive 118, [receiver:]tryPrimitive:withArgs:. THis is a bit of a hack. The primtiive failure wsill not be unwound correctly. We may have to revisit this, but at least the simple case of 6 tryPrimitive: 118 withArgs: {9. {}} no longer crashes the VM. This is tye justification for the many changes in VMMaker.oscog-eem.3103. WIthout those changes the real VM crashes while the simulator carried on without identifying the null pointer violation; an unacceptable infelicity. =============== Diff against VMMaker.oscog-eem.3103 =============== Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveDoPrimitiveWithArgs (in category 'control primitives') ----- primitiveDoPrimitiveWithArgs "Implement either ProtoObject>>tryPrimitive: primIndex withArgs: argArray or Context>>receiver: anObject tryPrimitive: primIndex withArgs: argArray. If this primitive fails, arrange that its error code is a negative integer, to distinguish between this failing and the primitive it invokes failing." | argumentArray arraySize index primIdx savedNumArgs rcvr | objectMemory hasSpurMemoryManagerAPI ifTrue: "See checkForAndFollowForwardedPrimitiveState" [metaAccessorDepth := -2]. (argumentCount between: 2 and: 3) ifFalse: [^self primitiveFailFor: PrimErrUnsupported negated]. argumentArray := self stackTop. primIdx := self stackValue: 1. ((objectMemory isArray: argumentArray) and: [objectMemory isIntegerObject: primIdx]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument negated]. arraySize := objectMemory numSlotsOf: argumentArray. (self roomToPushNArgs: arraySize) ifFalse: [^self primitiveFailFor: PrimErrLimitExceeded negated]. primIdx := objectMemory integerValueOf: primIdx. primitiveFunctionPointer := self functionPointerFor: primIdx inClass: nil. primitiveFunctionPointer = 0 ifTrue: [primitiveFunctionPointer := #primitiveDoPrimitiveWithArgs. ^self primitiveFailFor: PrimErrBadIndex negated]. "Pop primIndex and argArray, then push args in place..." (savedNumArgs := argumentCount) = 3 ifTrue: "...and receiver if the three arg form" [tempOop2 := self stackValue: 4. "actual receiver" rcvr := self stackValue: 3. "receiver for primitive" (objectMemory isOopForwarded: rcvr) ifTrue: [rcvr := objectMemory followForwarded: rcvr]. self pop: 4; push: rcvr] "use first arg as receiver" ifFalse: [self pop: 2]. argumentCount := arraySize. index := 1. [index <= arraySize] whileTrue: [self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray). index := index + 1]. self isPrimitiveFunctionPointerAnIndex ifTrue: [self externalQuickPrimitiveResponse. tempOop2 := 0. ^nil]. "We use tempOop instead of pushRemappableOop:/popRemappableOop here because in the Cogit primitiveEnterCriticalSection, primitiveSignal, primitiveResume et al longjmp back to either the interpreter or machine code, depending on the process activated. So if we're executing one of these primitives, control won't actually return here and the matching popRemappableOop: wouldn't occur, potentially overflowing the remap buffer. Note that while recursion could occur (nil tryPrimitive: 118 withArgs: #(118 #(110 #()))) it counts as shooting oneself in the foot." tempOop := argumentArray. "prim might alloc/gc" "Run the primitive (sets primFailCode)" objectMemory hasSpurMemoryManagerAPI ifTrue: "See checkForAndFollowForwardedPrimitiveState" [metaAccessorDepth := primitiveAccessorDepthTable at: primIdx]. self slowPrimitiveResponse. self successful ifFalse: "If primitive failed, then restore state for failure code" + [tempOop = 0 ifTrue: "the primitive failed in a recursive invocation. can't fix things with no value..." + [^self]. + self pop: arraySize. - [self pop: arraySize. savedNumArgs = 3 ifTrue: [rcvr := self stackTop. self stackTopPut: tempOop2. self push: rcvr]. self pushInteger: primIdx. self push: tempOop. primitiveFunctionPointer := #primitiveDoPrimitiveWithArgs. argumentCount := savedNumArgs]. tempOop := tempOop2 := 0!

1 0

VM Maker: VMMaker.oscog-eem.3103.mcz
by commits＠source.squeak.org 21 Nov '21

21 Nov '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3103.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3103 Author: eem Time: 20 November 2021, 10:28:32.93554 pm UUID: bb290580-b6e4-4b61-9b09-646e111025de Ancestors: VMMaker.oscog-eem.3102 SpurMemoryManager simulation: Implement a null pointer trap by not including the first word in simulated memory. So instead of adding one to the reduced memory address in SpurNNBitMMLE[Co]Sim,ulator???>>longAt:[put:] et al, just divide by the word size. Hence 0 to wordSize - 1 map to zero, which is an invalid index. This has pervasive effects in the surrogate classes. So refactor them, adding a new class CogSurrogate. Implement their code generators in the CogSurrogate hierarchy, invoked from the relevant classes in the VMStructType hierarchy. Have these surrogates access memory via objectMemory, rather than accessing an objectMemory's memory directly. This implies signed/unsigned conversions in places. Although this is an enormous amount of work for a little change, it is worth it. Thie simulator has been missing null pointer references for ever. Not good ;-). And at least we get rid of the horrible little CogitFaker class which was used only to check the location of the cpicHasMNUCaseOrCMIsFullBlock flag bit. =============== Diff against VMMaker.oscog-eem.3102 =============== Item was changed: SystemOrganization addCategory: #'VMMaker-Building'! SystemOrganization addCategory: #'VMMaker-Interpreter'! SystemOrganization addCategory: #'VMMaker-InterpreterSimulation'! SystemOrganization addCategory: #'VMMaker-JIT'! SystemOrganization addCategory: #'VMMaker-JITSimulation'! SystemOrganization addCategory: #'VMMaker-Multithreading'! SystemOrganization addCategory: #'VMMaker-Plugins'! SystemOrganization addCategory: #'VMMaker-Plugins-FFI'! SystemOrganization addCategory: #'VMMaker-Plugins-IOS'! SystemOrganization addCategory: #'VMMaker-PostProcessing'! SystemOrganization addCategory: #'VMMaker-SmartSyntaxPlugins'! SystemOrganization addCategory: #'VMMaker-SpurMemoryManager'! SystemOrganization addCategory: #'VMMaker-SpurMemoryManagerSimulation'! SystemOrganization addCategory: #'VMMaker-Support'! SystemOrganization addCategory: #'VMMaker-Tests'! SystemOrganization addCategory: #'VMMaker-Translation to C'! SystemOrganization addCategory: #'VMMaker-Utilities'! - SystemOrganization addCategory: #'VMMaker-JIT-Simulation'! Item was removed: - ----- Method: CogBlockMethodSurrogate32>>cmIsUnlinked (in category 'accessing generated') ----- - cmIsUnlinked - ^(((memory unsignedByteAt: address + 6) bitShift: -4) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogBlockMethodSurrogate32>>cmIsUnlinked: (in category 'accessing generated') ----- - cmIsUnlinked: aValue - memory - unsignedByteAt: address + 6 - put: (((memory unsignedByteAt: address + 6) bitAnd: 16rEF) + ((aValue ifTrue: [1] ifFalse: [0]) bitShift: 4)). - ^aValue! Item was changed: ----- Method: CogBlockMethodSurrogate32>>padToWord (in category 'accessing generated') ----- padToWord + ^objectMemory long32At: address + 4! - ^memory unsignedLongAt: address + 5! Item was changed: ----- Method: CogBlockMethodSurrogate32>>padToWord: (in category 'accessing generated') ----- padToWord: aValue | index delta | + index := address + 4. - index := address + 5. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta - memory - unsignedLongAt: index - delta put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: index put: aValue! Item was removed: - ----- Method: CogBlockMethodSurrogate64>>cmIsUnlinked (in category 'accessing generated') ----- - cmIsUnlinked - ^(((memory unsignedByteAt: address + 10) bitShift: -4) bitAnd: 16r1) ~= 0! Item was removed: - ----- Method: CogBlockMethodSurrogate64>>cmIsUnlinked: (in category 'accessing generated') ----- - cmIsUnlinked: aValue - memory - unsignedByteAt: address + 10 - put: (((memory unsignedByteAt: address + 10) bitAnd: 16rEF) + ((aValue ifTrue: [1] ifFalse: [0]) bitShift: 4)). - ^aValue! Item was changed: ----- Method: CogBlockMethodSurrogate64>>padToWord (in category 'accessing generated') ----- padToWord + ^objectMemory long64At: address + 4! - ^memory unsignedLong64At: address + 5! Item was changed: ----- Method: CogBlockMethodSurrogate64>>padToWord: (in category 'accessing generated') ----- padToWord: aValue | index delta | + index := address + 4. - index := address + 5. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta - memory - unsignedLong64At: index - delta put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: index put: aValue! Item was changed: + CogSurrogate subclass: #CogMethodSurrogate + instanceVariableNames: 'baseHeaderSize' - VMClass subclass: #CogMethodSurrogate - instanceVariableNames: 'address memory baseHeaderSize cogit' classVariableNames: '' poolDictionaries: 'CogMethodConstants VMBytecodeConstants' category: 'VMMaker-JITSimulation'! + + !CogMethodSurrogate commentStamp: 'eem 11/20/2021 12:02' prior: 0! + A CogMethodSurrogate is an emulation of the in-memory structs that are used for the header of methods, in-lined block methods, and pics. + + Instance Variables + address: <Integer> + offset: <Integer> + cogit: <SimpleStackBasedCogit> + memory: <Bitmap|LittleEndianBitmap|DoubleWordArray> + + address + - the address in memory of the start of the struct + + offset + - an offset to be added to the address so that it can adapt to object header sizes, and SpurMemoryManager's memoryOffset + + cogit + - the instance of SimpleStackBasedCogit or subclass that created this surrogate + + memory + - the cogit's objectMemory's memory array, which is accessed directly! Item was added: + ----- Method: CogMethodSurrogate>>at:cogit:objectMemory: (in category 'instance initialization') ----- + at: anAddress cogit: aCogit objectMemory: anObjectMemory + super at: anAddress cogit: aCogit objectMemory: anObjectMemory. + baseHeaderSize := anObjectMemory baseHeaderSize! Item was removed: - ----- Method: CogMethodSurrogate>>at:memory:headerSize:cogit: (in category 'instance initialization') ----- - at: anAddress memory: memoryArray headerSize: headerSize cogit: aCogit - address := anAddress. - memory := memoryArray. - baseHeaderSize := headerSize. - cogit := aCogit! Item was removed: - ----- Method: CogMethodSurrogate>>at:objectMemory:cogit: (in category 'instance initialization') ----- - at: anAddress objectMemory: objectMemory cogit: aCogit - address := anAddress. - memory := objectMemory memory. - baseHeaderSize := objectMemory baseHeaderSize. - cogit := aCogit! Item was changed: ----- Method: CogMethodSurrogate>>cbUsesInstVars (in category 'accessing generated') ----- cbUsesInstVars + <bitPosition: 17 width: 1> + ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0! - ^(((memory unsignedByteAt: address + 3 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0! Item was changed: ----- Method: CogMethodSurrogate>>cbUsesInstVars: (in category 'accessing generated') ----- cbUsesInstVars: aValue | index delta | + index := address + 2 + baseHeaderSize. - index := address + baseHeaderSize + 3. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0])). - memory - unsignedByteAt: index - delta - put: (((memory unsignedByteAt: index - delta) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0]))]. - memory - unsignedByteAt: index - put: (((memory unsignedByteAt: index) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0])). ^aValue! Item was changed: ----- Method: CogMethodSurrogate>>cmHasMovableLiteral (in category 'accessing generated') ----- cmHasMovableLiteral + <bitPosition: 18 width: 1> + ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -2) bitAnd: 16r1) ~= 0! - ^(((memory unsignedByteAt: address + 3 + baseHeaderSize) bitShift: -2) bitAnd: 16r1) ~= 0! Item was changed: ----- Method: CogMethodSurrogate>>cmHasMovableLiteral: (in category 'accessing generated') ----- cmHasMovableLiteral: aValue | index delta | + index := address + 2 + baseHeaderSize. - index := address + baseHeaderSize + 3. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0])). - memory - unsignedByteAt: index - delta - put: (((memory unsignedByteAt: index - delta) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0]))]. - memory - unsignedByteAt: index - put: (((memory unsignedByteAt: index) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0])). ^aValue! Item was changed: ----- Method: CogMethodSurrogate>>cmNumArgs (in category 'accessing generated') ----- cmNumArgs + <bitPosition: 0 width: 8> + ^objectMemory byteAt: address + baseHeaderSize! - ^memory unsignedByteAt: address + 1 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate>>cmNumArgs: (in category 'accessing generated') ----- cmNumArgs: aValue | index delta | + index := address + baseHeaderSize. - index := address + baseHeaderSize + 1. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta - memory - unsignedByteAt: index - delta put: aValue]. + ^objectMemory + byteAt: index - ^memory - unsignedByteAt: index put: aValue! Item was changed: ----- Method: CogMethodSurrogate>>cmRefersToYoung (in category 'accessing generated') ----- cmRefersToYoung + <bitPosition: 11 width: 1> + ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -3) bitAnd: 16r1) ~= 0! - ^(((memory unsignedByteAt: address + 2 + baseHeaderSize) bitShift: -3) bitAnd: 16r1) ~= 0! Item was changed: ----- Method: CogMethodSurrogate>>cmRefersToYoung: (in category 'accessing generated') ----- cmRefersToYoung: aValue | index delta | + index := address + 1 + baseHeaderSize. - index := address + baseHeaderSize + 2. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0])). - memory - unsignedByteAt: index - delta - put: (((memory unsignedByteAt: index - delta) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0]))]. - memory - unsignedByteAt: index - put: (((memory unsignedByteAt: index) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0])). ^aValue! Item was changed: ----- Method: CogMethodSurrogate>>cmType (in category 'accessing generated') ----- cmType + <bitPosition: 8 width: 3> + ^(objectMemory byteAt: address + 1 + baseHeaderSize) bitAnd: 16r7! - ^(memory unsignedByteAt: address + 2 + baseHeaderSize) bitAnd: 16r7! Item was changed: ----- Method: CogMethodSurrogate>>cmType: (in category 'accessing generated') ----- cmType: aValue | index delta | + index := address + 1 + baseHeaderSize. - index := address + baseHeaderSize + 2. self assert: (aValue between: 0 and: 16r7). (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: ((objectMemory byteAt: index - delta) bitAnd: 16rF8) + aValue]. + objectMemory + byteAt: index + put: ((objectMemory byteAt: index) bitAnd: 16rF8) + aValue. - memory - unsignedByteAt: index - delta - put: ((memory unsignedByteAt: index - delta) bitAnd: 16rF8) + aValue]. - memory - unsignedByteAt: index - put: ((memory unsignedByteAt: index) bitAnd: 16rF8) + aValue. ^aValue! Item was changed: ----- Method: CogMethodSurrogate>>cmUsageCount (in category 'accessing generated') ----- cmUsageCount + <bitPosition: 13 width: 3> + ^((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -5) bitAnd: 16r7! - ^((memory unsignedByteAt: address + 2 + baseHeaderSize) bitShift: -5) bitAnd: 16r7! Item was changed: ----- Method: CogMethodSurrogate>>cmUsageCount: (in category 'accessing generated') ----- cmUsageCount: aValue | index delta | + index := address + 1 + baseHeaderSize. - index := address + baseHeaderSize + 2. self assert: (aValue between: 0 and: 16r7). (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: ((objectMemory byteAt: index - delta) bitAnd: 16r1F) + (aValue bitShift: 5)]. + objectMemory + byteAt: index + put: ((objectMemory byteAt: index) bitAnd: 16r1F) + (aValue bitShift: 5). - memory - unsignedByteAt: index - delta - put: ((memory unsignedByteAt: index - delta) bitAnd: 16r1F) + (aValue bitShift: 5)]. - memory - unsignedByteAt: index - put: ((memory unsignedByteAt: index) bitAnd: 16r1F) + (aValue bitShift: 5). ^aValue! Item was changed: ----- Method: CogMethodSurrogate>>cmUsesPenultimateLit (in category 'accessing generated') ----- cmUsesPenultimateLit + <bitPosition: 16 width: 1> + ^((objectMemory byteAt: address + 2 + baseHeaderSize) bitAnd: 16r1) ~= 0! - ^((memory unsignedByteAt: address + 3 + baseHeaderSize) bitAnd: 16r1) ~= 0! Item was changed: ----- Method: CogMethodSurrogate>>cmUsesPenultimateLit: (in category 'accessing generated') ----- cmUsesPenultimateLit: aValue | index delta | + index := address + 2 + baseHeaderSize. - index := address + baseHeaderSize + 3. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0])). - memory - unsignedByteAt: index - delta - put: (((memory unsignedByteAt: index - delta) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0]))]. - memory - unsignedByteAt: index - put: (((memory unsignedByteAt: index) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0])). ^aValue! Item was changed: ----- Method: CogMethodSurrogate>>cpicHasMNUCaseOrCMIsFullBlock (in category 'accessing generated') ----- cpicHasMNUCaseOrCMIsFullBlock + <bitPosition: 12 width: 1> + ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -4) bitAnd: 16r1) ~= 0! - ^(((memory unsignedByteAt: address + 2 + baseHeaderSize) bitShift: -4) bitAnd: 16r1) ~= 0! Item was changed: ----- Method: CogMethodSurrogate>>cpicHasMNUCaseOrCMIsFullBlock: (in category 'accessing generated') ----- cpicHasMNUCaseOrCMIsFullBlock: aValue | index delta | + index := address + 1 + baseHeaderSize. - index := address + baseHeaderSize + 2. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0])). - memory - unsignedByteAt: index - delta - put: (((memory unsignedByteAt: index - delta) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0]))]. - memory - unsignedByteAt: index - put: (((memory unsignedByteAt: index) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0])). ^aValue! Item was changed: ----- Method: CogMethodSurrogate>>homeOffset (in category 'accessing generated') ----- homeOffset + <bitPosition: 0 width: 16> + ^objectMemory shortAt: address! - ^memory unsignedShortAt: address + 1! Item was changed: ----- Method: CogMethodSurrogate>>homeOffset: (in category 'accessing generated') ----- homeOffset: aValue | index delta | + index := address. - index := address + 1. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + shortAt: index - delta - memory - unsignedShortAt: index - delta put: aValue]. + ^objectMemory + shortAt: index - ^memory - unsignedShortAt: index put: aValue! Item was changed: ----- Method: CogMethodSurrogate>>objectHeader (in category 'accessing') ----- objectHeader "N.B. This *must* be signed. We use it for relocation when compacting the code zone." ^baseHeaderSize = 8 + ifTrue: [(objectMemory long64At: address) signedIntFromLong64] + ifFalse: [(objectMemory longAt: address) signedIntFromLong]! - ifTrue: [memory long64At: address + 1] - ifFalse: [memory longAt: address + 1]! Item was changed: ----- Method: CogMethodSurrogate>>objectHeader: (in category 'accessing') ----- objectHeader: aValue | delta | (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). baseHeaderSize = 8 + ifTrue: [objectMemory long64At: address - delta put: aValue signedIntToLong64] + ifFalse: [objectMemory longAt: address - delta put: aValue signedIntToLong]]. + baseHeaderSize = 8 + ifTrue: [objectMemory long64At: address put: aValue signedIntToLong64] + ifFalse: [objectMemory longAt: address put: aValue signedIntToLong]. + ^aValue! - ifTrue: [memory long64At: address - delta + 1 put: aValue] - ifFalse: [memory longAt: address - delta + 1 put: aValue]]. - ^baseHeaderSize = 8 - ifTrue: [memory long64At: address + 1 put: aValue] - ifFalse: [memory longAt: address + 1 put: aValue]! Item was changed: ----- Method: CogMethodSurrogate>>stackCheckOffset (in category 'accessing generated') ----- stackCheckOffset + <bitPosition: 20 width: 12> + ^((objectMemory shortAt: address + 2 + baseHeaderSize) bitShift: -4) bitAnd: 16rFFF! - ^((memory unsignedShortAt: address + 3 + baseHeaderSize) bitShift: -4) bitAnd: 16rFFF! Item was changed: ----- Method: CogMethodSurrogate>>stackCheckOffset: (in category 'accessing generated') ----- stackCheckOffset: aValue | index delta | + index := address + 2 + baseHeaderSize. - index := address + baseHeaderSize + 3. self assert: (aValue between: 0 and: 16rFFF). (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + shortAt: index - delta + put: ((objectMemory shortAt: index - delta) bitAnd: 16rF) + (aValue bitShift: 4)]. + objectMemory + shortAt: index + put: ((objectMemory shortAt: index) bitAnd: 16rF) + (aValue bitShift: 4). - memory - unsignedShortAt: index - delta - put: ((memory unsignedShortAt: index - delta) bitAnd: 16rF) + (aValue bitShift: 4)]. - memory - unsignedShortAt: index - put: ((memory unsignedShortAt: index) bitAnd: 16rF) + (aValue bitShift: 4). ^aValue! Item was changed: ----- Method: CogMethodSurrogate>>startpc (in category 'accessing generated') ----- startpc + <bitPosition: 16 width: 16> + ^objectMemory shortAt: address + 2! - ^memory unsignedShortAt: address + 3! Item was changed: ----- Method: CogMethodSurrogate>>startpc: (in category 'accessing generated') ----- startpc: aValue | index delta | + index := address + 2. - index := address + 3. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + shortAt: index - delta - memory - unsignedShortAt: index - delta put: aValue]. + ^objectMemory + shortAt: index - ^memory - unsignedShortAt: index put: aValue! Item was changed: ----- Method: CogMethodSurrogate32>>blockEntryOffset (in category 'accessing generated') ----- blockEntryOffset + <bitPosition: 48 width: 16> + ^objectMemory shortAt: address + 6 + baseHeaderSize! - ^memory unsignedShortAt: address + 7 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate32>>blockEntryOffset: (in category 'accessing generated') ----- blockEntryOffset: aValue | index delta | + index := address + 6 + baseHeaderSize. - index := address + baseHeaderSize + 7. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + shortAt: index - delta - memory - unsignedShortAt: index - delta put: aValue]. + ^objectMemory + shortAt: index - ^memory - unsignedShortAt: index put: aValue! Item was changed: ----- Method: CogMethodSurrogate32>>blockSize (in category 'accessing generated') ----- blockSize + <bitPosition: 32 width: 16> + ^objectMemory shortAt: address + 4 + baseHeaderSize! - ^memory unsignedShortAt: address + 5 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate32>>blockSize: (in category 'accessing generated') ----- blockSize: aValue | index delta | + index := address + 4 + baseHeaderSize. - index := address + baseHeaderSize + 5. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + shortAt: index - delta - memory - unsignedShortAt: index - delta put: aValue]. + ^objectMemory + shortAt: index - ^memory - unsignedShortAt: index put: aValue! Item was added: + ----- Method: CogMethodSurrogate32>>cbUsesInstVars (in category 'accessing generated') ----- + cbUsesInstVars + <bitPosition: 17 width: 1> + ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate32>>cbUsesInstVars: (in category 'accessing generated') ----- + cbUsesInstVars: aValue + + | index delta | + index := address + 2 + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0])). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate32>>cmHasMovableLiteral (in category 'accessing generated') ----- + cmHasMovableLiteral + <bitPosition: 18 width: 1> + ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -2) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate32>>cmHasMovableLiteral: (in category 'accessing generated') ----- + cmHasMovableLiteral: aValue + + | index delta | + index := address + 2 + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0])). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate32>>cmNumArgs (in category 'accessing generated') ----- + cmNumArgs + <bitPosition: 0 width: 8> + ^objectMemory byteAt: address + baseHeaderSize! Item was added: + ----- Method: CogMethodSurrogate32>>cmNumArgs: (in category 'accessing generated') ----- + cmNumArgs: aValue + + | index delta | + index := address + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: aValue]. + ^objectMemory + byteAt: index + put: aValue! Item was added: + ----- Method: CogMethodSurrogate32>>cmRefersToYoung (in category 'accessing generated') ----- + cmRefersToYoung + <bitPosition: 11 width: 1> + ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -3) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate32>>cmRefersToYoung: (in category 'accessing generated') ----- + cmRefersToYoung: aValue + + | index delta | + index := address + 1 + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0])). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate32>>cmType (in category 'accessing generated') ----- + cmType + <bitPosition: 8 width: 3> + ^(objectMemory byteAt: address + 1 + baseHeaderSize) bitAnd: 16r7! Item was added: + ----- Method: CogMethodSurrogate32>>cmType: (in category 'accessing generated') ----- + cmType: aValue + + | index delta | + index := address + 1 + baseHeaderSize. + self assert: (aValue between: 0 and: 16r7). + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: ((objectMemory byteAt: index - delta) bitAnd: 16rF8) + aValue]. + objectMemory + byteAt: index + put: ((objectMemory byteAt: index) bitAnd: 16rF8) + aValue. + ^aValue! Item was added: + ----- Method: CogMethodSurrogate32>>cmUsageCount (in category 'accessing generated') ----- + cmUsageCount + <bitPosition: 13 width: 3> + ^((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -5) bitAnd: 16r7! Item was added: + ----- Method: CogMethodSurrogate32>>cmUsageCount: (in category 'accessing generated') ----- + cmUsageCount: aValue + + | index delta | + index := address + 1 + baseHeaderSize. + self assert: (aValue between: 0 and: 16r7). + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: ((objectMemory byteAt: index - delta) bitAnd: 16r1F) + (aValue bitShift: 5)]. + objectMemory + byteAt: index + put: ((objectMemory byteAt: index) bitAnd: 16r1F) + (aValue bitShift: 5). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate32>>cmUsesPenultimateLit (in category 'accessing generated') ----- + cmUsesPenultimateLit + <bitPosition: 16 width: 1> + ^((objectMemory byteAt: address + 2 + baseHeaderSize) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate32>>cmUsesPenultimateLit: (in category 'accessing generated') ----- + cmUsesPenultimateLit: aValue + + | index delta | + index := address + 2 + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0])). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate32>>cpicHasMNUCaseOrCMIsFullBlock (in category 'accessing generated') ----- + cpicHasMNUCaseOrCMIsFullBlock + <bitPosition: 12 width: 1> + ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -4) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate32>>cpicHasMNUCaseOrCMIsFullBlock: (in category 'accessing generated') ----- + cpicHasMNUCaseOrCMIsFullBlock: aValue + + | index delta | + index := address + 1 + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0])). + ^aValue! Item was changed: ----- Method: CogMethodSurrogate32>>methodHeader (in category 'accessing generated') ----- methodHeader + ^objectMemory long32At: address + 12 + baseHeaderSize! - ^memory unsignedLongAt: address + 13 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate32>>methodHeader: (in category 'accessing generated') ----- methodHeader: aValue | index delta | + index := address + 12 + baseHeaderSize. - index := address + baseHeaderSize + 13. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta - memory - unsignedLongAt: index - delta put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: index put: aValue! Item was changed: ----- Method: CogMethodSurrogate32>>methodObject (in category 'accessing generated') ----- methodObject + ^objectMemory long32At: address + 8 + baseHeaderSize! - ^memory unsignedLongAt: address + 9 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate32>>methodObject: (in category 'accessing generated') ----- methodObject: aValue | index delta | + index := address + 8 + baseHeaderSize. - index := address + baseHeaderSize + 9. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta - memory - unsignedLongAt: index - delta put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: index put: aValue! Item was changed: ----- Method: CogMethodSurrogate32>>selector (in category 'accessing generated') ----- selector + ^objectMemory long32At: address + 16 + baseHeaderSize! - ^memory unsignedLongAt: address + 17 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate32>>selector: (in category 'accessing generated') ----- selector: aValue | index delta | + index := address + 16 + baseHeaderSize. - index := address + baseHeaderSize + 17. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta - memory - unsignedLongAt: index - delta put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: index put: aValue! Item was added: + ----- Method: CogMethodSurrogate32>>stackCheckOffset (in category 'accessing generated') ----- + stackCheckOffset + <bitPosition: 20 width: 12> + ^((objectMemory shortAt: address + 2 + baseHeaderSize) bitShift: -4) bitAnd: 16rFFF! Item was added: + ----- Method: CogMethodSurrogate32>>stackCheckOffset: (in category 'accessing generated') ----- + stackCheckOffset: aValue + + | index delta | + index := address + 2 + baseHeaderSize. + self assert: (aValue between: 0 and: 16rFFF). + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + shortAt: index - delta + put: ((objectMemory shortAt: index - delta) bitAnd: 16rF) + (aValue bitShift: 4)]. + objectMemory + shortAt: index + put: ((objectMemory shortAt: index) bitAnd: 16rF) + (aValue bitShift: 4). + ^aValue! Item was changed: ----- Method: CogMethodSurrogate64>>blockEntryOffset (in category 'accessing generated') ----- blockEntryOffset + <bitPosition: 48 width: 16> + ^objectMemory shortAt: address + 6 + baseHeaderSize! - ^memory unsignedShortAt: address + 7 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate64>>blockEntryOffset: (in category 'accessing generated') ----- blockEntryOffset: aValue | index delta | + index := address + 6 + baseHeaderSize. - index := address + baseHeaderSize + 7. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + shortAt: index - delta - memory - unsignedShortAt: index - delta put: aValue]. + ^objectMemory + shortAt: index - ^memory - unsignedShortAt: index put: aValue! Item was changed: ----- Method: CogMethodSurrogate64>>blockSize (in category 'accessing generated') ----- blockSize + <bitPosition: 32 width: 16> + ^objectMemory shortAt: address + 4 + baseHeaderSize! - ^memory unsignedShortAt: address + 5 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate64>>blockSize: (in category 'accessing generated') ----- blockSize: aValue | index delta | + index := address + 4 + baseHeaderSize. - index := address + baseHeaderSize + 5. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + shortAt: index - delta - memory - unsignedShortAt: index - delta put: aValue]. + ^objectMemory + shortAt: index - ^memory - unsignedShortAt: index put: aValue! Item was added: + ----- Method: CogMethodSurrogate64>>cbUsesInstVars (in category 'accessing generated') ----- + cbUsesInstVars + <bitPosition: 17 width: 1> + ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate64>>cbUsesInstVars: (in category 'accessing generated') ----- + cbUsesInstVars: aValue + + | index delta | + index := address + 2 + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0])). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate64>>cmHasMovableLiteral (in category 'accessing generated') ----- + cmHasMovableLiteral + <bitPosition: 18 width: 1> + ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -2) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate64>>cmHasMovableLiteral: (in category 'accessing generated') ----- + cmHasMovableLiteral: aValue + + | index delta | + index := address + 2 + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0])). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate64>>cmNumArgs (in category 'accessing generated') ----- + cmNumArgs + <bitPosition: 0 width: 8> + ^objectMemory byteAt: address + baseHeaderSize! Item was added: + ----- Method: CogMethodSurrogate64>>cmNumArgs: (in category 'accessing generated') ----- + cmNumArgs: aValue + + | index delta | + index := address + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: aValue]. + ^objectMemory + byteAt: index + put: aValue! Item was added: + ----- Method: CogMethodSurrogate64>>cmRefersToYoung (in category 'accessing generated') ----- + cmRefersToYoung + <bitPosition: 11 width: 1> + ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -3) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate64>>cmRefersToYoung: (in category 'accessing generated') ----- + cmRefersToYoung: aValue + + | index delta | + index := address + 1 + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0])). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate64>>cmType (in category 'accessing generated') ----- + cmType + <bitPosition: 8 width: 3> + ^(objectMemory byteAt: address + 1 + baseHeaderSize) bitAnd: 16r7! Item was added: + ----- Method: CogMethodSurrogate64>>cmType: (in category 'accessing generated') ----- + cmType: aValue + + | index delta | + index := address + 1 + baseHeaderSize. + self assert: (aValue between: 0 and: 16r7). + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: ((objectMemory byteAt: index - delta) bitAnd: 16rF8) + aValue]. + objectMemory + byteAt: index + put: ((objectMemory byteAt: index) bitAnd: 16rF8) + aValue. + ^aValue! Item was added: + ----- Method: CogMethodSurrogate64>>cmUsageCount (in category 'accessing generated') ----- + cmUsageCount + <bitPosition: 13 width: 3> + ^((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -5) bitAnd: 16r7! Item was added: + ----- Method: CogMethodSurrogate64>>cmUsageCount: (in category 'accessing generated') ----- + cmUsageCount: aValue + + | index delta | + index := address + 1 + baseHeaderSize. + self assert: (aValue between: 0 and: 16r7). + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: ((objectMemory byteAt: index - delta) bitAnd: 16r1F) + (aValue bitShift: 5)]. + objectMemory + byteAt: index + put: ((objectMemory byteAt: index) bitAnd: 16r1F) + (aValue bitShift: 5). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate64>>cmUsesPenultimateLit (in category 'accessing generated') ----- + cmUsesPenultimateLit + <bitPosition: 16 width: 1> + ^((objectMemory byteAt: address + 2 + baseHeaderSize) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate64>>cmUsesPenultimateLit: (in category 'accessing generated') ----- + cmUsesPenultimateLit: aValue + + | index delta | + index := address + 2 + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0])). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate64>>cpicHasMNUCaseOrCMIsFullBlock (in category 'accessing generated') ----- + cpicHasMNUCaseOrCMIsFullBlock + <bitPosition: 12 width: 1> + ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -4) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate64>>cpicHasMNUCaseOrCMIsFullBlock: (in category 'accessing generated') ----- + cpicHasMNUCaseOrCMIsFullBlock: aValue + + | index delta | + index := address + 1 + baseHeaderSize. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + byteAt: index - delta + put: (((objectMemory byteAt: index - delta) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0]))]. + objectMemory + byteAt: index + put: (((objectMemory byteAt: index) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0])). + ^aValue! Item was changed: ----- Method: CogMethodSurrogate64>>methodHeader (in category 'accessing generated') ----- methodHeader + ^objectMemory long64At: address + 16 + baseHeaderSize! - ^memory unsignedLong64At: address + 17 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate64>>methodHeader: (in category 'accessing generated') ----- methodHeader: aValue | index delta | + index := address + 16 + baseHeaderSize. - index := address + baseHeaderSize + 17. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta - memory - unsignedLong64At: index - delta put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: index put: aValue! Item was changed: ----- Method: CogMethodSurrogate64>>methodObject (in category 'accessing generated') ----- methodObject + ^objectMemory long64At: address + 8 + baseHeaderSize! - ^memory unsignedLong64At: address + 9 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate64>>methodObject: (in category 'accessing generated') ----- methodObject: aValue | index delta | + index := address + 8 + baseHeaderSize. - index := address + baseHeaderSize + 9. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta - memory - unsignedLong64At: index - delta put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: index put: aValue! Item was changed: ----- Method: CogMethodSurrogate64>>selector (in category 'accessing generated') ----- selector + ^objectMemory long64At: address + 24 + baseHeaderSize! - ^memory unsignedLong64At: address + 25 + baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate64>>selector: (in category 'accessing generated') ----- selector: aValue | index delta | + index := address + 24 + baseHeaderSize. - index := address + baseHeaderSize + 25. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta - memory - unsignedLong64At: index - delta put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: index put: aValue! Item was added: + ----- Method: CogMethodSurrogate64>>stackCheckOffset (in category 'accessing generated') ----- + stackCheckOffset + <bitPosition: 20 width: 12> + ^((objectMemory shortAt: address + 2 + baseHeaderSize) bitShift: -4) bitAnd: 16rFFF! Item was added: + ----- Method: CogMethodSurrogate64>>stackCheckOffset: (in category 'accessing generated') ----- + stackCheckOffset: aValue + + | index delta | + index := address + 2 + baseHeaderSize. + self assert: (aValue between: 0 and: 16rFFF). + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + shortAt: index - delta + put: ((objectMemory shortAt: index - delta) bitAnd: 16rF) + (aValue bitShift: 4)]. + objectMemory + shortAt: index + put: ((objectMemory shortAt: index) bitAnd: 16rF) + (aValue bitShift: 4). + ^aValue! Item was changed: ----- Method: CogNewspeakMethodSurrogate32>>nextMethodOrIRCs (in category 'accessing generated') ----- nextMethodOrIRCs + ^objectMemory long32At: address + 20 + baseHeaderSize! - ^memory unsignedLongAt: address + 21 + baseHeaderSize! Item was changed: ----- Method: CogNewspeakMethodSurrogate32>>nextMethodOrIRCs: (in category 'accessing generated') ----- nextMethodOrIRCs: aValue | index delta | + index := address + baseHeaderSize + 20. - index := address + baseHeaderSize + 21. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + longAt: index - delta - memory - unsignedLongAt: index - delta put: aValue]. + ^objectMemory + longAt: index - ^memory - unsignedLongAt: index put: aValue! Item was changed: ----- Method: CogNewspeakMethodSurrogate64>>nextMethodOrIRCs (in category 'accessing generated') ----- nextMethodOrIRCs + ^objectMemory long64At: address + 32 + baseHeaderSize! - ^memory unsignedLong64At: address + 33 + baseHeaderSize! Item was changed: ----- Method: CogNewspeakMethodSurrogate64>>nextMethodOrIRCs: (in category 'accessing generated') ----- nextMethodOrIRCs: aValue | index delta | + index := address + baseHeaderSize + 32. - index := address + baseHeaderSize + 33. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta - memory - unsignedLong64At: index - delta put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: index put: aValue! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>bitAndByteOffsetOfIsFullBlockBitInto: (in category 'in-line cacheing') ----- bitAndByteOffsetOfIsFullBlockBitInto: aBlock <inline: true> "This supplies the bitmask for the isFullBlock bit, and the offset of the byte containing that bit in a CogMethod header to aBlock. We don't have named variables holding this offset. The following assert tests whether the values are correct by creating a surrogate on an empty ByteArray, setting the bit, and checking that the expected values are set in the ByteArray." self cCode: [] inSmalltalk: + [| pragma | + pragma := (CogMethodSurrogate64 >> #cpicHasMNUCaseOrCMIsFullBlock) + pragmaAt: #bitPosition:width:. + self assert: pragma arguments = #(12 "4th bit of 2nd byte after objectHeader" 1)]. - [| m | - m := ByteArray new: 16. - CogBlockMethodSurrogate64 new - at: 0 memory: m headerSize: 8 cogit: CogitFaker new; - cpicHasMNUCaseOrCMIsFullBlock: true. - self assert: m = #[0 0 0 0 0 0 0 0 0 16 0 0 0 0 0 0]. - self assert: (m at: objectMemory baseHeaderSize + 2) = 16]. aBlock value: 16 value: objectMemory baseHeaderSize + 1 "zero-relative"! Item was changed: ----- Method: CogSistaMethodSurrogate32>>counters (in category 'accessing generated') ----- counters + ^objectMemory long32At: address + 20 + baseHeaderSize! - ^memory unsignedLongAt: address + 21 + baseHeaderSize! Item was changed: ----- Method: CogSistaMethodSurrogate32>>counters: (in category 'accessing generated') ----- counters: aValue | index delta | + index := address + 20 + baseHeaderSize. - index := address + baseHeaderSize + 21. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta - memory - unsignedLongAt: index - delta put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: index put: aValue! Item was changed: ----- Method: CogSistaMethodSurrogate64>>counters (in category 'accessing generated') ----- counters + ^objectMemory long64At: address + 32 + baseHeaderSize! - ^memory unsignedLong64At: address + 33 + baseHeaderSize! Item was changed: ----- Method: CogSistaMethodSurrogate64>>counters: (in category 'accessing generated') ----- counters: aValue | index delta | + index := address + 32 + baseHeaderSize. - index := address + baseHeaderSize + 33. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta - memory - unsignedLong64At: index - delta put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: index put: aValue! Item was added: + ----- Method: CogStackPage class>>fieldAccessorSourceFor:bytesPerWord: (in category 'code generation') ----- + fieldAccessorSourceFor: surrogateClass bytesPerWord: bytesPerWord + ^(super fieldAccessorSourceFor: surrogateClass bytesPerWord: bytesPerWord) + removeKey: {surrogateClass. #padToWord } ifAbsent: []; + removeKey: {surrogateClass. #padToWord: } ifAbsent: []; + yourself! Item was removed: - ----- Method: CogStackPage class>>getter:bitPosition:bitWidth:type: (in category 'code generation') ----- - getter: getter bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil - ^String streamContents: - [:s| | startByte endByte accessor | - startByte := bitPosition // 8. - endByte := bitPosition + bitWidth - 1 // 8. - self assert: bitPosition \\ 8 = 0. - self assert: startByte \\ (bitWidth // 8) = 0. - accessor := #('byte' 'short' 'long' 'long') - at: endByte - startByte + 1 - ifAbsent: ['long64']. - s nextPutAll: getter; crtab: 1; nextPut: $^. - (typeOrNil notNil and: [typeOrNil last = $*]) ifTrue: - [accessor := 'unsigned', (accessor copy - at: 1 put: accessor first asUppercase; - yourself)]. - (typeOrNil notNil and: ['*StackPage*' match: typeOrNil]) ifTrue: - [s nextPutAll: 'stackPages surrogateAtAddress: (']. - s nextPutAll: 'memory '; - nextPutAll: accessor; - nextPutAll: 'At: address + '; print: startByte + 1. - (typeOrNil notNil and: ['*StackPage*' match: typeOrNil]) ifTrue: - [s nextPut: $)]] - - "| bitPosition | - bitPosition := 0. - (self fieldAccessorsForBytesPerWord: 4) collect: - [:spec| - bitPosition := bitPosition + spec second. - self getter: spec first - bitPosition: bitPosition - spec second - bitWidth: spec second - type: (spec at: 3 ifAbsent: [])]"! Item was removed: - ----- Method: CogStackPage class>>setter:bitPosition:bitWidth:type: (in category 'code generation') ----- - setter: getter bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil - ^String streamContents: - [:s| | startByte endByte accessor | - startByte := bitPosition // 8. - endByte := bitPosition + bitWidth - 1 // 8. - self assert: bitPosition \\ 8 = 0. - self assert: startByte \\ (bitWidth // 8) = 0. - accessor := #('byte' 'short' 'long' 'long') - at: endByte - startByte + 1 - ifAbsent: ['long64']. - s nextPutAll: getter; nextPutAll: ': aValue'; crtab: 1; - nextPutAll: 'self assert: (address + '; print: startByte; - nextPutAll: ' >= zoneBase and: [address + '; print: endByte; - nextPutAll: ' < zoneLimit]).'; crtab: 1. - (typeOrNil notNil and: [typeOrNil last = $*]) ifTrue: - [accessor := 'unsigned', (accessor copy - at: 1 put: accessor first asUppercase; - yourself)]. - (typeOrNil notNil and: ['*StackPage*' match: typeOrNil]) ifFalse: - [s nextPut: $^]. - s nextPutAll: 'memory '; - nextPutAll: accessor; nextPutAll: 'At: address + '; print: startByte + 1; - nextPutAll: ' put: aValue'. - (typeOrNil notNil and: ['*StackPage*' match: typeOrNil]) ifTrue: - [s nextPutAll: ' asInteger.'; crtab: 1; nextPutAll: '^aValue']] - - "| bitPosition | - bitPosition := 0. - (self fieldAccessorsForBytesPerWord: 4) collect: - [:spec| - bitPosition := bitPosition + spec second. - self setter: spec first - bitPosition: bitPosition - spec second - bitWidth: spec second - type: (spec at: 3 ifAbsent: [])]"! Item was changed: + CogSurrogate subclass: #CogStackPageSurrogate + instanceVariableNames: 'stackPages zoneBase zoneLimit' - Object subclass: #CogStackPageSurrogate - instanceVariableNames: 'address stackPages memory zoneBase zoneLimit' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-JITSimulation'! Item was added: + ----- Method: CogStackPageSurrogate class>>getter:offsetExpression:bitPosition:bitWidth:type: (in category 'code generation') ----- + getter: getter offsetExpression: offsetExpr bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil + self assert: offsetExpr isNil. + ^String streamContents: + [:s| | startByte endByte accessor | + startByte := bitPosition // 8. + endByte := bitPosition + bitWidth - 1 // 8. + self assert: bitPosition \\ 8 = 0. + self assert: startByte \\ (bitWidth // 8) = 0. + accessor := #(byteAt: shortAt: long32At: long64At:) at: (endByte - startByte) highBit + 1. + s nextPutAll: getter; crtab: 1; nextPut: $^. + typeOrNil ifNotNil: + [('*StackPage*' match: typeOrNil) ifTrue: + [s nextPutAll: 'stackPages surrogateAtAddress: (']. + typeOrNil == #int ifTrue: + [s nextPut: $(]]. + s nextPutAll: #objectMemory; space; + nextPutAll: accessor; + nextPutAll: ' address'. + startByte > 0 ifTrue: + [s nextPutAll: ' + '; print: startByte]. + typeOrNil ifNotNil: + [('*StackPage*' match: typeOrNil) ifTrue: + [s nextPut: $)]. + typeOrNil == #int ifTrue: + [s nextPutAll: ') '; nextPutAll: #signedIntFromLong]]] + + "| bitPosition | + bitPosition := 0. + (CogStackPage fieldAccessorsForBytesPerWord: BytesPerWord) collect: + [:spec| + bitPosition := bitPosition + spec second. + self getter: spec first + offsetExpression: nil + bitPosition: bitPosition - spec second + bitWidth: spec second + type: (spec at: 3 ifAbsent: [])]"! Item was added: + ----- Method: CogStackPageSurrogate class>>setter:offsetExpression:bitPosition:bitWidth:type: (in category 'code generation') ----- + setter: getter offsetExpression: offsetExpr bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil + self assert: offsetExpr isNil. + ^String streamContents: + [:s| | startByte endByte accessor | + startByte := bitPosition // 8. + endByte := bitPosition + bitWidth - 1 // 8. + self assert: bitPosition \\ 8 = 0. + self assert: startByte \\ (bitWidth // 8) = 0. + accessor := #(byteAt: shortAt: long32At: long64At:) at: (endByte - startByte) highBit + 1. + s nextPutAll: getter; nextPutAll: ': aValue'; crtab: 1; + nextPutAll: 'self assert: (address'. + startByte > 0 ifTrue: + [s nextPutAll: ' + '; print: startByte]. + s nextPutAll: ' >= zoneBase and: [address + '; print: endByte; + nextPutAll: ' < zoneLimit]).'; crtab: 1. + typeOrNil ifNotNil: + [(typeOrNil == #int or: ['*StackPage*' match: typeOrNil]) ifFalse: + [s nextPut: $^]]. + s nextPutAll: #objectMemory; space; + nextPutAll: accessor; + nextPutAll: ' address'. + startByte > 0 ifTrue: + [s nextPutAll: ' + '; print: startByte]. + s nextPutAll: ' put: aValue'. + typeOrNil ifNotNil: + [('*StackPage*' match: typeOrNil) ifTrue: + [s nextPutAll: ' asInteger.'; crtab; nextPutAll: '^aValue']. + typeOrNil == #int ifTrue: + [s space; nextPutAll: #signedIntToLong; nextPut: $.; crtab; nextPutAll: '^aValue']]] + + "| bitPosition | + bitPosition := 0. + (CogStackPage fieldAccessorsForBytesPerWord: BytesPerWord) collect: + [:spec| + bitPosition := bitPosition + spec second. + self setter: spec first + offsetExpression: nil + bitPosition: bitPosition - spec second + bitWidth: spec second + type: (spec at: 3 ifAbsent: [])]"! Item was changed: ----- Method: CogStackPageSurrogate>>address:simulator:zoneBase:zoneLimit: (in category 'instance initialization') ----- address: theAddress simulator: aCoInterpreterSimulator zoneBase: base zoneLimit: limit address := theAddress. stackPages := aCoInterpreterSimulator stackPages. + objectMemory := aCoInterpreterSimulator objectMemory. - memory := aCoInterpreterSimulator memory. zoneBase := base. zoneLimit := limit! Item was changed: ----- Method: CogStackPageSurrogate32>>baseAddress (in category 'accessing generated') ----- baseAddress + ^objectMemory long32At: address + 16! - ^memory unsignedLongAt: address + 17! Item was changed: ----- Method: CogStackPageSurrogate32>>baseAddress: (in category 'accessing generated') ----- baseAddress: aValue self assert: (address + 16 >= zoneBase and: [address + 19 < zoneLimit]). + ^objectMemory long32At: address + 16 put: aValue! - ^memory unsignedLongAt: address + 17 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate32>>baseFP (in category 'accessing generated') ----- baseFP + ^objectMemory long32At: address + 12! - ^memory unsignedLongAt: address + 13! Item was changed: ----- Method: CogStackPageSurrogate32>>baseFP: (in category 'accessing generated') ----- baseFP: aValue self assert: (address + 12 >= zoneBase and: [address + 15 < zoneLimit]). + ^objectMemory long32At: address + 12 put: aValue! - ^memory unsignedLongAt: address + 13 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate32>>headFP (in category 'accessing generated') ----- headFP + ^objectMemory long32At: address + 8! - ^memory unsignedLongAt: address + 9! Item was changed: ----- Method: CogStackPageSurrogate32>>headFP: (in category 'accessing generated') ----- headFP: aValue self assert: (address + 8 >= zoneBase and: [address + 11 < zoneLimit]). + ^objectMemory long32At: address + 8 put: aValue! - ^memory unsignedLongAt: address + 9 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate32>>headSP (in category 'accessing generated') ----- headSP + ^objectMemory long32At: address + 4! - ^memory unsignedLongAt: address + 5! Item was changed: ----- Method: CogStackPageSurrogate32>>headSP: (in category 'accessing generated') ----- headSP: aValue self assert: (address + 4 >= zoneBase and: [address + 7 < zoneLimit]). + ^objectMemory long32At: address + 4 put: aValue! - ^memory unsignedLongAt: address + 5 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate32>>lastAddress (in category 'accessing generated') ----- lastAddress + ^objectMemory long32At: address + 24! - ^memory unsignedLongAt: address + 25! Item was changed: ----- Method: CogStackPageSurrogate32>>lastAddress: (in category 'accessing generated') ----- lastAddress: aValue self assert: (address + 24 >= zoneBase and: [address + 27 < zoneLimit]). + ^objectMemory long32At: address + 24 put: aValue! - ^memory unsignedLongAt: address + 25 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate32>>nextPage (in category 'accessing generated') ----- nextPage + ^stackPages surrogateAtAddress: (objectMemory long32At: address + 32)! - ^stackPages surrogateAtAddress: (memory unsignedLongAt: address + 33)! Item was changed: ----- Method: CogStackPageSurrogate32>>nextPage: (in category 'accessing generated') ----- nextPage: aValue self assert: (address + 32 >= zoneBase and: [address + 35 < zoneLimit]). + objectMemory long32At: address + 32 put: aValue asInteger. - memory unsignedLongAt: address + 33 put: aValue asInteger. ^aValue! Item was removed: - ----- Method: CogStackPageSurrogate32>>padToWord (in category 'accessing generated') ----- - padToWord - ^memory longAt: address + 33! Item was removed: - ----- Method: CogStackPageSurrogate32>>padToWord: (in category 'accessing generated') ----- - padToWord: aValue - self assert: (address + 32 >= zoneBase and: [address + 35 < zoneLimit]). - ^memory longAt: address + 33 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate32>>prevPage (in category 'accessing generated') ----- prevPage + ^stackPages surrogateAtAddress: (objectMemory long32At: address + 36)! - ^stackPages surrogateAtAddress: (memory unsignedLongAt: address + 37)! Item was changed: ----- Method: CogStackPageSurrogate32>>prevPage: (in category 'accessing generated') ----- prevPage: aValue self assert: (address + 36 >= zoneBase and: [address + 39 < zoneLimit]). + objectMemory long32At: address + 36 put: aValue asInteger. - memory unsignedLongAt: address + 37 put: aValue asInteger. ^aValue! Item was changed: ----- Method: CogStackPageSurrogate32>>realStackLimit (in category 'accessing generated') ----- realStackLimit + ^objectMemory long32At: address + 20! - ^memory unsignedLongAt: address + 21! Item was changed: ----- Method: CogStackPageSurrogate32>>realStackLimit: (in category 'accessing generated') ----- realStackLimit: aValue self assert: (address + 20 >= zoneBase and: [address + 23 < zoneLimit]). + ^objectMemory long32At: address + 20 put: aValue! - ^memory unsignedLongAt: address + 21 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate32>>stackLimit (in category 'accessing generated') ----- stackLimit + ^objectMemory long32At: address! - ^memory unsignedLongAt: address + 1! Item was changed: ----- Method: CogStackPageSurrogate32>>stackLimit: (in category 'accessing generated') ----- stackLimit: aValue + self assert: (address >= zoneBase and: [address + 3 < zoneLimit]). + ^objectMemory long32At: address put: aValue! - self assert: (address + 0 >= zoneBase and: [address + 3 < zoneLimit]). - ^memory unsignedLongAt: address + 1 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate32>>trace (in category 'accessing generated') ----- trace + ^(objectMemory long32At: address + 28) signedIntFromLong! - ^memory longAt: address + 29! Item was changed: ----- Method: CogStackPageSurrogate32>>trace: (in category 'accessing generated') ----- trace: aValue self assert: (address + 28 >= zoneBase and: [address + 31 < zoneLimit]). + objectMemory long32At: address + 28 put: aValue signedIntToLong. + ^aValue! - ^memory longAt: address + 29 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>baseAddress (in category 'accessing generated') ----- baseAddress + ^objectMemory long64At: address + 32! - ^memory unsignedLong64At: address + 33! Item was changed: ----- Method: CogStackPageSurrogate64>>baseAddress: (in category 'accessing generated') ----- baseAddress: aValue self assert: (address + 32 >= zoneBase and: [address + 39 < zoneLimit]). + ^objectMemory long64At: address + 32 put: aValue! - ^memory unsignedLong64At: address + 33 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>baseFP (in category 'accessing generated') ----- baseFP + ^objectMemory long64At: address + 24! - ^memory unsignedLong64At: address + 25! Item was changed: ----- Method: CogStackPageSurrogate64>>baseFP: (in category 'accessing generated') ----- baseFP: aValue self assert: (address + 24 >= zoneBase and: [address + 31 < zoneLimit]). + ^objectMemory long64At: address + 24 put: aValue! - ^memory unsignedLong64At: address + 25 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>headFP (in category 'accessing generated') ----- headFP + ^objectMemory long64At: address + 16! - ^memory unsignedLong64At: address + 17! Item was changed: ----- Method: CogStackPageSurrogate64>>headFP: (in category 'accessing generated') ----- headFP: aValue self assert: (address + 16 >= zoneBase and: [address + 23 < zoneLimit]). + ^objectMemory long64At: address + 16 put: aValue! - ^memory unsignedLong64At: address + 17 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>headSP (in category 'accessing generated') ----- headSP + ^objectMemory long64At: address + 8! - ^memory unsignedLong64At: address + 9! Item was changed: ----- Method: CogStackPageSurrogate64>>headSP: (in category 'accessing generated') ----- headSP: aValue self assert: (address + 8 >= zoneBase and: [address + 15 < zoneLimit]). + ^objectMemory long64At: address + 8 put: aValue! - ^memory unsignedLong64At: address + 9 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>lastAddress (in category 'accessing generated') ----- lastAddress + ^objectMemory long64At: address + 48! - ^memory unsignedLong64At: address + 49! Item was changed: ----- Method: CogStackPageSurrogate64>>lastAddress: (in category 'accessing generated') ----- lastAddress: aValue self assert: (address + 48 >= zoneBase and: [address + 55 < zoneLimit]). + ^objectMemory long64At: address + 48 put: aValue! - ^memory unsignedLong64At: address + 49 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>nextPage (in category 'accessing generated') ----- nextPage + ^stackPages surrogateAtAddress: (objectMemory long64At: address + 64)! - ^stackPages surrogateAtAddress: (memory unsignedLong64At: address + 65)! Item was changed: ----- Method: CogStackPageSurrogate64>>nextPage: (in category 'accessing generated') ----- nextPage: aValue self assert: (address + 64 >= zoneBase and: [address + 71 < zoneLimit]). + objectMemory long64At: address + 64 put: aValue asInteger. - memory unsignedLong64At: address + 65 put: aValue asInteger. ^aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>padToWord (in category 'accessing generated') ----- padToWord + ^(objectMemory long32At: address + 60) signedIntFromLong! - ^memory longAt: address + 61! Item was changed: ----- Method: CogStackPageSurrogate64>>padToWord: (in category 'accessing generated') ----- padToWord: aValue self assert: (address + 60 >= zoneBase and: [address + 63 < zoneLimit]). + ^objectMemory long32At: address + 60 put: aValue! - ^memory longAt: address + 61 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>prevPage (in category 'accessing generated') ----- prevPage + ^stackPages surrogateAtAddress: (objectMemory long64At: address + 72)! - ^stackPages surrogateAtAddress: (memory unsignedLong64At: address + 73)! Item was changed: ----- Method: CogStackPageSurrogate64>>prevPage: (in category 'accessing generated') ----- prevPage: aValue self assert: (address + 72 >= zoneBase and: [address + 79 < zoneLimit]). + objectMemory long64At: address + 72 put: aValue asInteger. - memory unsignedLong64At: address + 73 put: aValue asInteger. ^aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>realStackLimit (in category 'accessing generated') ----- realStackLimit + ^objectMemory long64At: address + 40! - ^memory unsignedLong64At: address + 41! Item was changed: ----- Method: CogStackPageSurrogate64>>realStackLimit: (in category 'accessing generated') ----- realStackLimit: aValue self assert: (address + 40 >= zoneBase and: [address + 47 < zoneLimit]). + ^objectMemory long64At: address + 40 put: aValue! - ^memory unsignedLong64At: address + 41 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>stackLimit (in category 'accessing generated') ----- stackLimit + ^objectMemory long64At: address! - ^memory unsignedLong64At: address + 1! Item was changed: ----- Method: CogStackPageSurrogate64>>stackLimit: (in category 'accessing generated') ----- stackLimit: aValue + self assert: (address >= zoneBase and: [address + 7 < zoneLimit]). + ^objectMemory long64At: address put: aValue! - self assert: (address + 0 >= zoneBase and: [address + 7 < zoneLimit]). - ^memory unsignedLong64At: address + 1 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>trace (in category 'accessing generated') ----- trace + ^(objectMemory long32At: address + 56) signedIntFromLong! - ^memory longAt: address + 57! Item was changed: ----- Method: CogStackPageSurrogate64>>trace: (in category 'accessing generated') ----- trace: aValue self assert: (address + 56 >= zoneBase and: [address + 59 < zoneLimit]). + objectMemory long32At: address + 56 put: aValue signedIntToLong. + ^aValue! - ^memory longAt: address + 57 put: aValue! Item was added: + VMClass subclass: #CogSurrogate + instanceVariableNames: 'address cogit objectMemory' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Support'! Item was added: + ----- Method: CogSurrogate class>>getter:offsetExpression:bitPosition:bitWidth:type: (in category 'code generation') ----- + getter: getter offsetExpression: offsetExpression bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil + ^String streamContents: + [:s| | startByte endByte alignedPowerOf2 shift | + startByte := bitPosition // 8. + endByte := bitPosition + bitWidth - 1 // 8. + shift := bitPosition \\ 8. + alignedPowerOf2 := (#(8 16 32 64) includes: bitWidth) and: [shift = 0]. + s nextPutAll: getter; crtab. + bitWidth < (BytesPerWord * 8) ifTrue: + [s nextPut: $<; print: (Message selector: #bitPosition:width: arguments: {bitPosition. bitWidth}); nextPut: $>; crtab]. + (typeOrNil notNil and: [typeOrNil last = $*]) ifTrue: + [s nextPutAll: '| v |'; crtab: 1]. + s nextPut: $^. + typeOrNil ifNotNil: + [s nextPut: $(. + typeOrNil last = $* ifTrue: + [s nextPutAll: 'v := ']]. + alignedPowerOf2 ifFalse: + [s nextPut: $(]. + shift ~= 0 ifTrue: + [s nextPut: $(]. + s nextPutAll: #objectMemory; space; + nextPutAll: (#(byteAt: shortAt: long32At: long64At:) at: (endByte - startByte) highBit + 1); + nextPutAll: ' address'. + startByte > 0 ifTrue: + [s nextPutAll: ' + '; print: startByte]. + offsetExpression ifNotNil: + [s nextPutAll: ' + '; nextPutAll: offsetExpression]. + shift ~= 0 ifTrue: + [s nextPutAll: ') bitShift: -'; print: shift]. + alignedPowerOf2 ifFalse: + [s nextPutAll: ') bitAnd: '; nextPutAll: ((1 << bitWidth) - 1) hex]. + typeOrNil ifNotNil: + [s nextPutAll: ') ~= 0'. + typeOrNil last = $* ifTrue: + [s nextPutAll: ' ifTrue:'; + crtab: 2; + nextPutAll: '[cogit cCoerceSimple: v to: '; + store: typeOrNil; + nextPut: $]]]]! Item was added: + ----- Method: CogSurrogate class>>putAtPut:type:mask:shift:on:indent: (in category 'code generation') ----- + putAtPut: accessor type: typeOrNil mask: maskOrNil shift: shift on: s indent: indent + "This is the inner part of the ap:put: in a setter, abstracted to eliminate duplication + given the overrides in CogBlockMethod et al for dual zone write simulation." + s nextPutAll: #objectMemory; + crtab: indent; nextPutAll: accessor; + crtab: indent; nextPutAll: 'put: '. + typeOrNil ifNotNil: + [s nextPut: $(]. + maskOrNil ifNotNil: + [s nextPutAll: '((objectMemory '; nextPutAll: accessor; + nextPutAll: ') bitAnd: '; nextPutAll: maskOrNil hex; + nextPutAll: ') + ']. + s nextPutAll: (typeOrNil + caseOf: { + [nil] -> [shift = 0 ifTrue: ['aValue'] ifFalse: ['(aValue bitShift: ', shift printString, ')']]. + [#Boolean] -> ['(aValue ifTrue: [', (1 << shift) printString, '] ifFalse: [0])'] } + otherwise: ['(aValue ifNotNil: [aValue asUnsignedInteger', (shift = 0 ifTrue: [''] ifFalse: [' bitShift: ', shift printString]), '] ifNil: [0])']). + typeOrNil ifNotNil: + [s nextPut: $)]! Item was added: + ----- Method: CogSurrogate class>>setter:offsetExpression:bitPosition:bitWidth:type: (in category 'code generation') ----- + setter: getter offsetExpression: offsetExpression bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil + ^String streamContents: + [:s| | startByte endByte shift alignedPowerOf2 accessor mask | + startByte := bitPosition // 8. + endByte := bitPosition + bitWidth - 1 // 8. + shift := bitPosition \\ 8. + alignedPowerOf2 := (#(8 16 32 64) includes: bitWidth) and: [shift = 0]. + accessor := (#(byteAt: shortAt: long32At: long64At:) at: (endByte - startByte) highBit + 1), + ' index'. + mask := (2 raisedTo: endByte - startByte + 1 * 8) - 1. + s nextPutAll: getter; nextPutAll: ': aValue'; crtab: 1. + s crtab: 1; nextPutAll: '| index delta |'; crtab: 1. + s nextPutAll: 'index := address'. + startByte > 0 ifTrue: + [s nextPutAll: ' + '; print: startByte]. + offsetExpression ifNotNil: + [s nextPutAll: ' + '; nextPutAll: offsetExpression]. + s nextPut: $.; crtab: 1. + (typeOrNil notNil or: [alignedPowerOf2]) ifFalse: + [s nextPutAll: 'self assert: (aValue between: 0 and: '; nextPutAll: ((1 << bitWidth) - 1) hex; nextPutAll: ').'; crtab: 1]. + s nextPutAll: '(delta := cogit getCodeToDataDelta) > 0 ifTrue:'; crtab: 2. + s nextPutAll: '[self assert: (cogit addressIsInCodeZone: address - delta).'; crtab: 2; space. + self putAtPut: accessor, ' - delta' + type: typeOrNil + mask: (alignedPowerOf2 ifFalse: [mask - ((1 << bitWidth - 1) << shift)]) + shift: shift + on: s + indent: 3. + s nextPutAll: '].'; crtab: 1. + alignedPowerOf2 ifTrue: + [s nextPut: $^]. + self putAtPut: accessor + type: typeOrNil + mask: (alignedPowerOf2 ifFalse: [mask - ((1 << bitWidth - 1) << shift)]) + shift: shift + on: s + indent: 2. + alignedPowerOf2 ifFalse: + [s nextPut: $.; crtab: 1; nextPutAll: '^aValue']]! Item was added: + ----- Method: CogSurrogate>>at:cogit:objectMemory: (in category 'instance initialization') ----- + at: anAddress cogit: aCogit objectMemory: anObjectMemory + address := anAddress. + cogit := aCogit. + objectMemory := anObjectMemory! Item was changed: ----- Method: Cogit>>cogBlockMethodSurrogateAt: (in category 'simulation only') ----- cogBlockMethodSurrogateAt: address <doNotGenerate> self assert: (address bitAnd: objectMemory wordSize - 1) = 0. ^cogBlockMethodSurrogateClass new at: address + cogit: self + objectMemory: objectMemory! - objectMemory: objectMemory - cogit: self! Item was changed: ----- Method: Cogit>>cogMethodSurrogateAt: (in category 'simulation only') ----- cogMethodSurrogateAt: address <doNotGenerate> self assert: (address < 0 or: [(address bitAnd: objectMemory wordSize - 1) = 0]). ^cogMethodSurrogateClass new at: address + cogit: self + objectMemory: objectMemory! - objectMemory: objectMemory - cogit: self! Item was changed: ----- Method: Cogit>>initializeCodeZoneFrom:upTo: (in category 'initialization') ----- initializeCodeZoneFrom: startAddress upTo: endAddress <api> self initializeBackend. self sqMakeMemoryExecutableFrom: startAddress To: endAddress CodeToDataDelta: (self cppIf: #DUAL_MAPPED_CODE_ZONE ifTrue: [self addressOf: codeToDataDelta put: [:v| codeToDataDelta := v]] ifFalse: [nil]). codeBase := methodZoneBase := startAddress. backEnd stopsFrom: startAddress to: endAddress - 1. self cCode: '' inSmalltalk: [self initializeProcessor. + backEnd stopsFrom: objectMemory memoryOffset "first word may not exist in the simulator's memory" to: guardPageSize - 1. - backEnd stopsFrom: 0 to: guardPageSize - 1. backEnd has64BitPerformanceCounter ifTrue: [self initializeSimulationIOHighResClockForProfiling]]. methodZone manageFrom: methodZoneBase to: endAddress. self assertValidDualZone. backEnd detectFeatures. self maybeGenerateCacheFlush. self generateVMOwnerLockFunctions. self genGetLeafCallStackPointers. self generateStackPointerCapture. self generateTrampolines. self computeEntryOffsets. self computeFullBlockEntryOffsets. self generateClosedPICPrototype. self alignMethodZoneBase. "None of the above is executed beyond ceCheckFeatures, so a bulk flush now is the leanest thing to do." backEnd flushICacheFrom: startAddress to: methodZoneBase asUnsignedInteger. self maybeFlushWritableZoneFrom: startAddress to: methodZoneBase asUnsignedInteger. "Repeat so that now the methodZone ignores the generated run-time." methodZone manageFrom: methodZoneBase to: endAddress. "N.B. this is assumed to be the last thing done in initialization; see Cogit>>initialized. This is done only to compute openPICSize; the generated code is discarded." self generateOpenPICPrototype! Item was changed: ----- Method: Cogit>>initializeProcessor (in category 'initialization') ----- initializeProcessor "Initialize the simulation processor, arranging that its initial stack is somewhere on the rump C stack." <doNotGenerate> guardPageSize := self class guardPageSize. lastNInstructions := OrderedCollection new. + processor + memoryOffset: objectMemory memoryOffset; + initializeStackFor: self. + self initializeProcessorStack: coInterpreter initialCStackAddress. - processor initializeStackFor: self. - self initializeProcessorStack: coInterpreter rumpCStackAddress. coInterpreter setCFramePointer: processor fp setCStackPointer: processor sp. (InitializationOptions at: #UseMultiProcessor ifAbsent: [false]) ifTrue: [processor := MultiProcessor for: processor coInterpreter: coInterpreter]. processorLock := Mutex new! Item was changed: ----- Method: Cogit>>nsSendCacheSurrogateAt: (in category 'simulation only') ----- nsSendCacheSurrogateAt: address <doNotGenerate> self assert: (address < 0 or: [(address bitAnd: objectMemory wordSize - 1) = 0]). ^nsSendCacheSurrogateClass new at: address + cogit: self + objectMemory: objectMemory! - objectMemory: objectMemory - cogit: self! Item was removed: - Object subclass: #CogitFaker - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'VMMaker-JIT-Simulation'! Item was removed: - ----- Method: CogitFaker>>assertValidDualZoneWriteAddress: (in category 'accessing') ----- - assertValidDualZoneWriteAddress: address! Item was removed: - ----- Method: CogitFaker>>getCodeToDataDelta (in category 'accessing') ----- - getCodeToDataDelta - ^0! Item was changed: + CogSurrogate subclass: #NSSendCacheSurrogate + instanceVariableNames: '' - VMClass subclass: #NSSendCacheSurrogate - instanceVariableNames: 'address memory cogit' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-JITSimulation'! Item was removed: - ----- Method: NSSendCacheSurrogate>>at:objectMemory:cogit: (in category 'as yet unclassified') ----- - at: anAddress objectMemory: objectMemory cogit: aCogit - address := anAddress. - memory := objectMemory memory. - cogit := aCogit! Item was changed: ----- Method: NSSendCacheSurrogate32>>classTag (in category 'accessing generated') ----- classTag + ^objectMemory long32At: address! - ^memory unsignedLongAt: address + 1! Item was changed: ----- Method: NSSendCacheSurrogate32>>classTag: (in category 'accessing generated') ----- classTag: aValue + + | index delta | + index := address. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta + put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: address + 1 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate32>>depth (in category 'accessing generated') ----- depth + ^objectMemory long32At: address + 20! - ^memory unsignedLongAt: address + 21! Item was changed: ----- Method: NSSendCacheSurrogate32>>depth: (in category 'accessing generated') ----- depth: aValue + + | index delta | + index := address + 20. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta + put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: address + 21 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate32>>enclosingObject (in category 'accessing generated') ----- enclosingObject + ^objectMemory long32At: address + 4! - ^memory unsignedLongAt: address + 5! Item was changed: ----- Method: NSSendCacheSurrogate32>>enclosingObject: (in category 'accessing generated') ----- enclosingObject: aValue + + | index delta | + index := address + 4. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta + put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: address + 5 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate32>>numArgs (in category 'accessing generated') ----- numArgs + ^objectMemory long32At: address + 16! - ^memory unsignedLongAt: address + 17! Item was changed: ----- Method: NSSendCacheSurrogate32>>numArgs: (in category 'accessing generated') ----- numArgs: aValue + + | index delta | + index := address + 16. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta + put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: address + 17 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate32>>selector (in category 'accessing generated') ----- selector + ^objectMemory long32At: address + 12! - ^memory unsignedLongAt: address + 13! Item was changed: ----- Method: NSSendCacheSurrogate32>>selector: (in category 'accessing generated') ----- selector: aValue + + | index delta | + index := address + 12. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta + put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: address + 13 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate32>>target (in category 'accessing generated') ----- target + ^objectMemory long32At: address + 8! - ^memory unsignedLongAt: address + 9! Item was changed: ----- Method: NSSendCacheSurrogate32>>target: (in category 'accessing generated') ----- target: aValue + + | index delta | + index := address + 8. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long32At: index - delta + put: aValue]. + ^objectMemory + long32At: index - ^memory - unsignedLongAt: address + 9 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate64>>classTag (in category 'accessing generated') ----- classTag + ^objectMemory long64At: address! - ^memory unsignedLong64At: address + 1! Item was changed: ----- Method: NSSendCacheSurrogate64>>classTag: (in category 'accessing generated') ----- classTag: aValue + + | index delta | + index := address. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta + put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: address + 1 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate64>>depth (in category 'accessing generated') ----- depth + ^objectMemory long64At: address + 40! - ^memory unsignedLong64At: address + 41! Item was changed: ----- Method: NSSendCacheSurrogate64>>depth: (in category 'accessing generated') ----- depth: aValue + + | index delta | + index := address + 40. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta + put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: address + 41 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate64>>enclosingObject (in category 'accessing generated') ----- enclosingObject + ^objectMemory long64At: address + 8! - ^memory unsignedLong64At: address + 9! Item was changed: ----- Method: NSSendCacheSurrogate64>>enclosingObject: (in category 'accessing generated') ----- enclosingObject: aValue + + | index delta | + index := address + 8. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta + put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: address + 9 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate64>>numArgs (in category 'accessing generated') ----- numArgs + ^objectMemory long64At: address + 32! - ^memory unsignedLong64At: address + 33! Item was changed: ----- Method: NSSendCacheSurrogate64>>numArgs: (in category 'accessing generated') ----- numArgs: aValue + + | index delta | + index := address + 32. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta + put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: address + 33 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate64>>selector (in category 'accessing generated') ----- selector + ^objectMemory long64At: address + 24! - ^memory unsignedLong64At: address + 25! Item was changed: ----- Method: NSSendCacheSurrogate64>>selector: (in category 'accessing generated') ----- selector: aValue + + | index delta | + index := address + 24. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta + put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: address + 25 put: aValue! Item was changed: ----- Method: NSSendCacheSurrogate64>>target (in category 'accessing generated') ----- target + ^objectMemory long64At: address + 16! - ^memory unsignedLong64At: address + 17! Item was changed: ----- Method: NSSendCacheSurrogate64>>target: (in category 'accessing generated') ----- target: aValue + + | index delta | + index := address + 16. + (delta := cogit getCodeToDataDelta) > 0 ifTrue: + [self assert: (cogit addressIsInCodeZone: address - delta). + objectMemory + long64At: index - delta + put: aValue]. + ^objectMemory + long64At: index - ^memory - unsignedLong64At: address + 17 put: aValue! Item was added: + ----- Method: NewCoObjectMemorySimulator>>memoryOffset (in category 'simulation only') ----- + memoryOffset + ^0! Item was changed: ----- Method: NewObjectMemory>>printMemoryFrom:to: (in category 'printing') ----- printMemoryFrom: start to: end <doNotGenerate> + | transcript address | - | address | address := start bitAnd: (self wordSize - 1) bitInvert. + (transcript := coInterpreter transcript) ensureCr. [address < end] whileTrue: + [(coInterpreter pst: '%WP: %WP\n') f: transcript printf: { address. self longAt: address}. - [coInterpreter printHex: address; printChar: $:; space; printHex: (self longAt: address); cr. address := address + self wordSize]! Item was added: + ----- Method: SmallInteger>>signedIntToLong64 (in category '*VMMaker-interpreter simulator') ----- + signedIntToLong64 + "Produces a 64-bit value in twos-comp form. Truncates if out-of-range as per a C cast. + Self is a signed or unsigned 64-bit integer. + Currently SmallIntegers are either 31-bit (in the 32-bit implementation) or 61-bit + (in the 64-bit implementation) so save some time by overriding in the subclass." + + self >= 0 ifTrue: [^self]. + ^super signedIntToLong64! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>byteAt: (in category 'memory access') ----- byteAt: byteAddress | lowBits long32 | lowBits := byteAddress bitAnd: 3. + long32 := memory at: byteAddress - lowBits // 4. - long32 := self long32At: byteAddress - lowBits. ^(long32 bitShift: -8 * lowBits) bitAnd: 16rFF! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte | lowBits long32 longAddress mask value | lowBits := byteAddress bitAnd: 3. + longAddress := byteAddress - lowBits // 4. + long32 := memory at: longAddress. - longAddress := byteAddress - lowBits. - long32 := self long32At: longAddress. mask := (16rFF bitShift: 8 * lowBits) bitInvert. value := byte bitShift: 8 * lowBits. + memory at: longAddress put: ((long32 bitAnd: mask) bitOr: value). - self long32At: longAddress put: ((long32 bitAnd: mask) bitOr: value). ^byte! Item was changed: + ----- Method: Spur32BitMMLECoSimulator>>cogCodeBase (in category 'Cog JIT support') ----- - ----- Method: Spur32BitMMLECoSimulator>>cogCodeBase (in category 'simulation only') ----- cogCodeBase ^Cogit guardPageSize! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>long64At: (in category 'memory access') ----- long64At: byteAddress + "memory is a Bitmap, a 32-bit indexable array of bits. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "memory is a Bitmap, a 32-bit indexable array of bits" | hiWord loWord | byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + loWord := memory at: byteAddress // 4. + hiWord := memory at: byteAddress // 4 + 1. - loWord := memory at: byteAddress // 4 + 1. - hiWord := memory at: byteAddress // 4 + 2. ^hiWord = 0 ifTrue: [loWord] ifFalse: [(hiWord bitShift: 32) + loWord]! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>longAt: (in category 'memory access') ----- longAt: byteAddress + "Note: Adjusted for Smalltalk's 1-based array indexing. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "Note: Adjusted for Smalltalk's 1-based array indexing." byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 4! - ^memory at: byteAddress // 4 + 1! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>longAt:put: (in category 'memory access') ----- longAt: byteAddress put: a32BitValue + "Note: Adjusted for Smalltalk's 1-based array indexing. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "Note: Adjusted for Smalltalk's 1-based array indexing." - "(byteAddress = 16r101348 and: [a32BitValue = 16r53]) ifTrue: - [self halt]." - "((byteAddress between: 16rda8ac and: 16rda8c0) - or: [byteAddress between: 16r8eb98 and: 16r8ebb0]) ifTrue: - [self halt]." byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + + "((byteAddress between: 16rA and: 16rB) and: [a32BitValue = 16rC]) ifTrue: + [self halt]." + + ^memory at: byteAddress // 4 put: a32BitValue! - ^memory at: byteAddress // 4 + 1 put: a32BitValue! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>memoryBaseForImageRead (in category 'snapshot') ----- memoryBaseForImageRead "Answer the address to read the image into. Override so that when bootstrapping, the segmentManager's segments are undisturbed in adjustSegmentSwizzlesBy:" ^bootstrapping + ifTrue: [self startOfMemory] - ifTrue: [0] ifFalse: [super memoryBaseForImageRead]! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>memoryOffset (in category 'Cog JIT support') ----- + memoryOffset + "The first word of memory is unused in order to implement a null pointer trap. + Hence the processor simulators must offset addresses by minus this amount." + ^4! Item was changed: ----- Method: Spur32BitMMLESimulator>>byteAt: (in category 'memory access') ----- byteAt: byteAddress | lowBits long32 | lowBits := byteAddress bitAnd: 3. + long32 := memory at: byteAddress - lowBits // 4. - long32 := self long32At: byteAddress - lowBits. ^(long32 bitShift: -8 * lowBits) bitAnd: 16rFF! Item was changed: ----- Method: Spur32BitMMLESimulator>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte | lowBits long32 longAddress mask value | lowBits := byteAddress bitAnd: 3. + longAddress := byteAddress - lowBits // 4. + long32 := memory at: longAddress. - longAddress := byteAddress - lowBits. - long32 := self long32At: longAddress. mask := (16rFF bitShift: 8 * lowBits) bitInvert. value := byte bitShift: 8 * lowBits. + memory at: longAddress put: ((long32 bitAnd: mask) bitOr: value). - self long32At: longAddress put: ((long32 bitAnd: mask) bitOr: value). ^byte! Item was changed: ----- Method: Spur32BitMMLESimulator>>long64At: (in category 'memory access') ----- long64At: byteAddress + "memory is a Bitmap, a 32-bit indexable array of bits. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "memory is a Bitmap, a 32-bit indexable array of bits" | hiWord loWord | byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + loWord := memory at: byteAddress // 4. + hiWord := memory at: byteAddress // 4 + 1. - loWord := memory at: byteAddress // 4 + 1. - hiWord := memory at: byteAddress // 4 + 2. ^hiWord = 0 ifTrue: [loWord] ifFalse: [(hiWord bitShift: 32) + loWord]! Item was changed: ----- Method: Spur32BitMMLESimulator>>longAt: (in category 'memory access') ----- longAt: byteAddress + "Note: Adjusted for Smalltalk's 1-based array indexing. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "Note: Adjusted for Smalltalk's 1-based array indexing." byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 4! - ^memory at: byteAddress // 4 + 1! Item was changed: ----- Method: Spur32BitMMLESimulator>>longAt:put: (in category 'memory access') ----- longAt: byteAddress put: a32BitValue + "Note: Adjusted for Smalltalk's 1-based array indexing. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "Note: Adjusted for Smalltalk's 1-based array indexing." - "(byteAddress = 16r183FB00 and: [a32BitValue = 16r3FFFFC]) ifTrue: - [self halt]." - "(byteAddress between: 16r33FBB8 and: 16r33FBCF) ifTrue: - [self halt]." byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + + "((byteAddress between: 16rA and: 16rB) and: [a32BitValue = 16rC]) ifTrue: + [self halt]." + + ^memory at: byteAddress // 4 put: a32BitValue! - ^memory at: byteAddress // 4 + 1 put: a32BitValue! Item was changed: ----- Method: Spur32BitMMLESimulator>>memoryBaseForImageRead (in category 'snapshot') ----- memoryBaseForImageRead "Answer the address to read the image into. Override so that when bootstrapping, the segmentManager's segments are undisturbed in adjustSegmentSwizzlesBy:" ^bootstrapping + ifTrue: [self startOfMemory] - ifTrue: [0] ifFalse: [super memoryBaseForImageRead]! Item was changed: + ----- Method: Spur64BitMMLECoSimulator>>cogCodeBase (in category 'Cog JIT support') ----- - ----- Method: Spur64BitMMLECoSimulator>>cogCodeBase (in category 'simulation only') ----- cogCodeBase ^Cogit guardPageSize! Item was changed: ----- Method: Spur64BitMMLECoSimulator>>long32At: (in category 'memory access') ----- long32At: byteAddress + "Note: Adjusted for Smalltalk's 1-based array indexing. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "Note: Adjusted for Smalltalk's 1-based array indexing." byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 4! - ^memory at: byteAddress // 4 + 1! Item was changed: ----- Method: Spur64BitMMLECoSimulator>>long32At:put: (in category 'memory access') ----- long32At: byteAddress put: a32BitValue + "Note: Adjusted for Smalltalk's 1-based array indexing. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "Note: Adjusted for Smalltalk's 1-based array indexing." - "(byteAddress = 16r183FB00 and: [a32BitValue = 16r3FFFFC]) ifTrue: - [self halt]." - "(byteAddress between: 16r33FBB8 and: 16r33FBCF) ifTrue: - [self halt]." byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + + "((byteAddress between: 16rA and: 16rB) and: [a32BitValue = 16rC]) ifTrue: + [self halt]." + + ^memory at: byteAddress // 4 put: a32BitValue! - ^memory at: byteAddress // 4 + 1 put: a32BitValue! Item was changed: ----- Method: Spur64BitMMLECoSimulator>>long64At: (in category 'memory access') ----- long64At: byteAddress + "memory is a Bitmap, a 32-bit indexable array of bits. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." - "memory is a Bitmap, a 32-bit indexable array of bits" | hiWord loWord | + byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + loWord := memory at: byteAddress // 4. + hiWord := memory at: byteAddress // 4 + 1. - loWord := memory at: byteAddress // 4 + 1. - hiWord := memory at: byteAddress // 4 + 2. ^hiWord = 0 ifTrue: [loWord] ifFalse: [(hiWord bitShift: 32) + loWord]! Item was changed: ----- Method: Spur64BitMMLECoSimulator>>memoryBaseForImageRead (in category 'snapshot') ----- memoryBaseForImageRead "Answer the address to read the image into. Override so that when bootstrapping, the segmentManager's segments are undisturbed in adjustSegmentSwizzlesBy:" ^bootstrapping + ifTrue: [self startOfMemory] - ifTrue: [0] ifFalse: [super memoryBaseForImageRead]! Item was added: + ----- Method: Spur64BitMMLECoSimulator>>memoryOffset (in category 'Cog JIT support') ----- + memoryOffset + "The first word of memory is unused in order to implement a null pointer trap. + Hence the processor simulators must offset addresses by minus this amount." + ^4! Item was changed: ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>byteAt: (in category 'memory access') ----- byteAt: byteAddress | lowBits long64 | lowBits := byteAddress bitAnd: 7. + long64 := memory at: byteAddress - lowBits // 8. - long64 := self long64At: byteAddress - lowBits. ^(long64 bitShift: -8 * lowBits) bitAnd: 16rFF! Item was changed: ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte + | lowBits longWord longAddress shift | - | lowBits long64 longAddress mask value | lowBits := byteAddress bitAnd: 7. + longAddress := byteAddress - lowBits // 8. + longWord := memory at: longAddress. + shift := lowBits * 8. + longWord := longWord + - (longWord bitAnd: (16rFF bitShift: shift)) + + (byte bitShift: shift). + memory at: longAddress put: longWord. - longAddress := byteAddress - lowBits. - long64 := self long64At: longAddress. - mask := (16rFF bitShift: 8 * lowBits) bitInvert. - value := byte bitShift: 8 * lowBits. - self long64At: longAddress put: ((long64 bitAnd: mask) bitOr: value). ^byte! Item was changed: ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>long64At: (in category 'memory access') ----- long64At: byteAddress "memory is a DoubleWordArray, a 64-bit indexable array of bits" + byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 8! - ^memory at: byteAddress // 8 + 1! Item was changed: ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>long64At:put: (in category 'memory access') ----- long64At: byteAddress put: a64BitValue + "memory is a DoubleWordArray, a 64-bit indexable array of bits. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "memory is a DoubleWordArray, a 64-bit indexable array of bits" byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + + "((byteAddress between: 16rA and: 16rB) and: [a64BitValue = 16rC]) ifTrue: + [self halt]." + + ^memory at: byteAddress // 8 put: a64BitValue! - ^memory at: byteAddress // 8 + 1 put: a64BitValue! Item was added: + ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>memoryOffset (in category 'Cog JIT support') ----- + memoryOffset + "The first word of memory is unused in order to implement a null pointer trap. + Hence the processor simulators must offset addresses by minus this amount." + ^8! Item was changed: ----- Method: Spur64BitMMLESimulator>>long32At: (in category 'memory access') ----- long32At: byteAddress + "Note: Adjusted for Smalltalk's 1-based array indexing. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "Note: Adjusted for Smalltalk's 1-based array indexing." byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 4! - ^memory at: byteAddress // 4 + 1! Item was changed: ----- Method: Spur64BitMMLESimulator>>long32At:put: (in category 'memory access') ----- long32At: byteAddress put: a32BitValue + "Note: Adjusted for Smalltalk's 1-based array indexing. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "Note: Adjusted for Smalltalk's 1-based array indexing." - "(byteAddress = 16r183FB00 and: [a32BitValue = 16r3FFFFC]) ifTrue: - [self halt]." - "(byteAddress between: 16r33FBB8 and: 16r33FBCF) ifTrue: - [self halt]." byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + + "((byteAddress between: 16rA and: 16rB) and: [a32BitValue = 16rC]) ifTrue: + [self halt]." + + ^memory at: byteAddress // 4 put: a32BitValue! - ^memory at: byteAddress // 4 + 1 put: a32BitValue! Item was changed: ----- Method: Spur64BitMMLESimulator>>long64At: (in category 'memory access') ----- long64At: byteAddress + "memory is a Bitmap, a 32-bit indexable array of bits. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." - "memory is a Bitmap, a 32-bit indexable array of bits" | hiWord loWord | + byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + loWord := memory at: byteAddress // 4. + hiWord := memory at: byteAddress // 4 + 1. - loWord := memory at: byteAddress // 4 + 1. - hiWord := memory at: byteAddress // 4 + 2. ^hiWord = 0 ifTrue: [loWord] ifFalse: [(hiWord bitShift: 32) + loWord]! Item was changed: ----- Method: Spur64BitMMLESimulator>>memoryBaseForImageRead (in category 'snapshot') ----- memoryBaseForImageRead "Answer the address to read the image into. Override so that when bootstrapping, the segmentManager's segments are undisturbed in adjustSegmentSwizzlesBy:" ^bootstrapping + ifTrue: [self startOfMemory] - ifTrue: [0] ifFalse: [super memoryBaseForImageRead]! Item was changed: ----- Method: Spur64BitMMLESimulatorFor64Bits>>byteAt: (in category 'memory access') ----- byteAt: byteAddress | lowBits long64 | lowBits := byteAddress bitAnd: 7. + long64 := memory at: byteAddress - lowBits // 8. - long64 := self long64At: byteAddress - lowBits. ^(long64 bitShift: -8 * lowBits) bitAnd: 16rFF! Item was changed: ----- Method: Spur64BitMMLESimulatorFor64Bits>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte + | lowBits longWord longAddress shift | - | lowBits long64 longAddress mask value | lowBits := byteAddress bitAnd: 7. + longAddress := byteAddress - lowBits // 8. + longWord := memory at: longAddress. + shift := lowBits * 8. + longWord := longWord + - (longWord bitAnd: (16rFF bitShift: shift)) + + (byte bitShift: shift). + memory at: longAddress put: longWord. - longAddress := byteAddress - lowBits. - long64 := self long64At: longAddress. - mask := (16rFF bitShift: 8 * lowBits) bitInvert. - value := byte bitShift: 8 * lowBits. - self long64At: longAddress put: ((long64 bitAnd: mask) bitOr: value). ^byte! Item was changed: ----- Method: Spur64BitMMLESimulatorFor64Bits>>long64At: (in category 'memory access') ----- long64At: byteAddress + "memory is a DoubleWordArray, a 64-bit indexable array of bits. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "memory is a DoubleWordArray, a 64-bit indexable array of bits" byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 8! - ^memory at: byteAddress // 8 + 1! Item was changed: ----- Method: Spur64BitMMLESimulatorFor64Bits>>long64At:put: (in category 'memory access') ----- long64At: byteAddress put: a64BitValue + "memory is a DoubleWordArray, a 64-bit indexable array of bits. + 0 is the null pointer, intended to produce an error; in practice 0 through 7 are all null pointers." + - "memory is a DoubleWordArray, a 64-bit indexable array of bits" byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + + "((byteAddress between: 16rA and: 16rB) and: [a64BitValue = 16rC]) ifTrue: + [self halt]." + + ^memory at: byteAddress // 8 put: a64BitValue! - ^memory at: byteAddress // 8 + 1 put: a64BitValue! Item was changed: ----- Method: SpurMemoryManager>>printMemoryFrom:to: (in category 'debug printing') ----- printMemoryFrom: start to: end <doNotGenerate> + | transcript address | - | address | address := start bitAnd: (self wordSize - 1) bitInvert. + (transcript := coInterpreter transcript) ensureCr. [address < end] whileTrue: + [(coInterpreter pst: '%WP: %WP\n') f: transcript printf: { address. self longAt: address}. - [coInterpreter printHex: address; printChar: $:; space; printHex: (self longAt: address); cr. address := address + self wordSize]! Item was changed: ----- Method: SpurMemoryManager>>startOfMemory (in category 'accessing') ----- startOfMemory + "Answer the start of object memory. Use a macro so as not to punish the debug VM. + Leave a guard page at the beginning for error checking." - "Return the start of object memory. Use a macro so as not to punish the debug VM." <cmacro: '() GIV(memory)'> <returnTypeC: #usqInt> + ^1024! - ^0! Item was changed: ----- Method: SpurSegmentManager>>readHeapFrom:at:dataBytes: (in category 'private') ----- readHeapFrom: f at: location dataBytes: numBytes "Read numBytes from f into mmory at location. Answer the number of bytes read." <inline: true> ^self cCode: [self sq: (self pointerForOop: location) Image: (self sizeof: #char) File: numBytes Read: f] inSmalltalk: [| bytesPerElement | bytesPerElement := manager memory bytesPerElement. (f readInto: manager memory + startingAt: location // bytesPerElement - startingAt: location // bytesPerElement + 1 count: numBytes // bytesPerElement) * bytesPerElement]! Item was changed: ----- Method: VMStructType class>>fieldAccessorSourceFor:bytesPerWord: (in category 'code generation') ----- fieldAccessorSourceFor: surrogateClass bytesPerWord: bytesPerWord "Answer a Dictionary of MethodReference to source for the accessors of the inst vars of the receiver and the alignedByteSize class method in surrogateClass with the given word size." "{CogBlockMethod fieldAccessorSourceFor: CogBlockMethodSurrogate32 bytesPerWord: 4. CogMethod fieldAccessorSourceFor: CogMethodSurrogate32 bytesPerWord: 4. CogBlockMethod fieldAccessorSourceFor: CogBlockMethodSurrogate64 bytesPerWord: 8. CogMethod fieldAccessorSourceFor: CogMethodSurrogate64 bytesPerWord: 8}" | methods bitPosition alignedByteSize currentOffset | methods := Dictionary new. bitPosition := 0. (self fieldAccessorsForBytesPerWord: bytesPerWord) do: [:spec| "reset the bitPosition if the offset expression changes." currentOffset ~= (self offsetForInstVar: spec first) ifTrue: [bitPosition := 0. currentOffset := self offsetForInstVar: spec first]. spec first ~= #unused ifTrue: [methods at: {surrogateClass. spec first asSymbol} + put: (surrogateClass + getter: spec first + offsetExpression: (self offsetForInstVar: spec first) + bitPosition: bitPosition + bitWidth: spec second + type: (spec at: 3 ifAbsent: [])); - put: (self getter: spec first - bitPosition: bitPosition - bitWidth: spec second - type: (spec at: 3 ifAbsent: [])); at: {surrogateClass. (spec first, ':') asSymbol} + put: (surrogateClass + setter: spec first + offsetExpression: (self offsetForInstVar: spec first) + bitPosition: bitPosition + bitWidth: spec second + type: (spec at: 3 ifAbsent: []))]. - put: (self setter: spec first - bitPosition: bitPosition - bitWidth: spec second - type: (spec at: 3 ifAbsent: []))]. bitPosition := bitPosition + spec second]. alignedByteSize := (self roundUpBitPosition: bitPosition toWordBoundary: bytesPerWord) / 8. self assert: alignedByteSize isInteger. methods at: {surrogateClass class. #alignedByteSize} put: #alignedByteSize , (String with: Character cr with: Character tab with: $^) , alignedByteSize printString, (currentOffset ifNil: [''] ifNotNil: [' + self ', currentOffset]). ^methods! Item was changed: ----- Method: VMStructType class>>fieldAccessorsForBytesPerWord: (in category 'code generation') ----- fieldAccessorsForBytesPerWord: bytesPerWord | fieldSpecs | fieldSpecs := OrderedCollection new. self instVarNamesAndTypesForTranslationDo: [:ivn :typeTuple| | index replacement | (index := typeTuple indexOf: #BytesPerWord ifAbsent: 0) > 0 ifTrue: [(typeTuple at: index + 1) = bytesPerWord ifTrue: [replacement := typeTuple copyReplaceFrom: index to: index + 1 with: #(). replacement size = 1 ifTrue: [replacement := replacement first]. fieldSpecs add: { ivn. replacement }]] ifFalse: [fieldSpecs add: { ivn. typeTuple }]]. ^fieldSpecs collect: [:tuple| [:ivn :typeTuple| { ('*unused*' match: ivn) ifTrue: [#unused] ifFalse: [ivn]. (typeTuple isArray and: ['unsigned' = typeTuple first]) ifTrue: [Integer readFrom: (typeTuple last readStream skipTo: $:; skipSeparators)] ifFalse: [typeTuple caseOf: { [#char] -> [8]. [#'unsigned char'] -> [8]. [#short] -> [16]. [#'unsigned short'] -> [16]. [#int] -> [32]. [#'unsigned int'] -> [32] } otherwise: [bytesPerWord * 8]]. typeTuple isArray ifTrue: [(typeTuple size >= 3 and: [typeTuple second = #Boolean]) ifTrue: [#Boolean]] ifFalse: + [(typeTuple last = $* + and: [typeTuple beginsWith: 'struct _']) "remove struct tag if any" + ifTrue: [(typeTuple allButFirst: 8) asSymbol] + ifFalse: [typeTuple]] }] valueWithArguments: tuple] - [typeTuple last = $* ifTrue: - [(typeTuple beginsWith: 'struct _') "remove struct tag if any" - ifTrue: [(typeTuple allButFirst: 8) asSymbol] - ifFalse: [typeTuple]]] }] valueWithArguments: tuple] "#(4 8) collect: [:bpw| (CogBlockMethod fieldAccessorsForBytesPerWord: bpw) asArray]" "#(4 8) collect: [:bpw| (CogMethod fieldAccessorsForBytesPerWord: bpw) asArray]"! Item was removed: - ----- Method: VMStructType class>>getter:bitPosition:bitWidth:type: (in category 'code generation') ----- - getter: getter bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil - ^String streamContents: - [:s| | startByte endByte alignedPowerOf2 shift | - startByte := bitPosition // 8. - endByte := bitPosition + bitWidth - 1 // 8. - shift := bitPosition \\ 8. - alignedPowerOf2 := (#(8 16 32 64) includes: bitWidth) and: [shift = 0]. - s nextPutAll: getter; crtab: 1. - (typeOrNil notNil and: [typeOrNil last = $*]) ifTrue: - [s nextPutAll: '| v |'; crtab: 1]. - s nextPut: $^. - typeOrNil ifNotNil: - [s nextPut: $(. - typeOrNil last = $* ifTrue: - [s nextPutAll: 'v := ']]. - alignedPowerOf2 ifFalse: - [s nextPut: $(]. - shift ~= 0 ifTrue: - [s nextPut: $(]. - s nextPutAll: 'memory unsigned'; - nextPutAll: (#('Byte' 'Short' 'Long' 'Long') - at: endByte - startByte + 1 - ifAbsent: ['Long64']); - nextPutAll: 'At: address + '; print: startByte + 1. - (self offsetForInstVar: getter) ifNotNil: - [:offsetExpr| s nextPutAll: ' + '; nextPutAll: offsetExpr]. - shift ~= 0 ifTrue: - [s nextPutAll: ') bitShift: -'; print: shift]. - alignedPowerOf2 ifFalse: - [s nextPutAll: ') bitAnd: '; nextPutAll: ((1 << bitWidth) - 1) hex]. - typeOrNil ifNotNil: - [s nextPutAll: ') ~= 0'. - typeOrNil last = $* ifTrue: - [s nextPutAll: ' ifTrue:'; - crtab: 2; - nextPutAll: '[cogit cCoerceSimple: v to: '; - store: typeOrNil; - nextPut: $]]]]! Item was removed: - ----- Method: VMStructType class>>putAtPut:type:mask:shift:on:indent: (in category 'code generation') ----- - putAtPut: accessor type: typeOrNil mask: maskOrNil shift: shift on: s indent: indent - "This is the inner part of the ap:put: in a setter, abstracted to eliminate duplication - given the overrides in CogBlockMethod et al for dual zone write simulation." - s nextPutAll: 'memory'; - crtab: indent; nextPutAll: accessor. - s crtab: indent; nextPutAll: 'put: '. - typeOrNil ifNotNil: - [s nextPut: $(]. - maskOrNil ifNotNil: - [s nextPutAll: '((memory '; nextPutAll: accessor; - nextPutAll: ') bitAnd: '; nextPutAll: maskOrNil hex; - nextPutAll: ') + ']. - s nextPutAll: (typeOrNil - caseOf: { - [nil] -> [shift = 0 ifTrue: ['aValue'] ifFalse: ['(aValue bitShift: ', shift printString, ')']]. - [#Boolean] -> ['(aValue ifTrue: [', (1 << shift) printString, '] ifFalse: [0])'] } - otherwise: ['(aValue ifNotNil: [aValue asUnsignedInteger', (shift = 0 ifTrue: [''] ifFalse: [' bitShift: ', shift printString]), '] ifNil: [0])']). - typeOrNil ifNotNil: - [s nextPut: $)]! Item was changed: ----- Method: VMStructType class>>setter:bitPosition:bitWidth:type: (in category 'code generation') ----- setter: getter bitPosition: bitPosition bitWidth: bitWidth type: typeOrNil + self shouldNotImplement. "should be under CogSurrogate class" ^String streamContents: [:s| | startByte endByte shift indexExpr accessor alignedPowerOf2 mask | startByte := bitPosition // 8. endByte := bitPosition + bitWidth - 1 // 8. shift := bitPosition \\ 8. s nextPutAll: getter; nextPutAll: ': aValue'; crtab: 1. indexExpr := 'address + ', ((self offsetForInstVar: getter) ifNotNil: [:offsetExpr| offsetExpr, ' + '] ifNil: ['']), (startByte + 1) printString. accessor := 'unsigned' , (#('Byte' 'Short' 'Long' 'Long') at: endByte - startByte + 1 ifAbsent: ['Long64']) , 'At: '. (alignedPowerOf2 := (#(8 16 32 64) includes: bitWidth) and: [shift = 0]) ifTrue: "index used once; no point using a temp to hold it" [accessor := accessor, indexExpr] ifFalse: "index used twice; cache it" [s nextPutAll: '| index |'; crtab: 1; nextPutAll: 'index := '; nextPutAll: indexExpr; nextPut: $.; crtab: 1. accessor := accessor, 'index']. mask := #(16rFF 16rFFFF 16rFFFFFFFF 16rFFFFFFFF) at: endByte - startByte + 1 ifAbsent: [(2 raisedTo: 64) - 1]. (typeOrNil notNil or: [alignedPowerOf2]) ifFalse: [s nextPutAll: 'self assert: (aValue between: 0 and: '; nextPutAll: ((1 << bitWidth) - 1) hex; nextPutAll: ').'; crtab: 1]. alignedPowerOf2 ifTrue: [s nextPut: $^]. self putAtPut: accessor type: typeOrNil mask: (alignedPowerOf2 ifFalse: [mask - ((1 << bitWidth - 1) << shift)]) shift: shift on: s indent: 2. alignedPowerOf2 ifFalse: [s nextPut: $.; crtab: 1; nextPutAll: '^aValue']]!

1 0

VM Maker: Cog-eem.448.mcz
by commits＠source.squeak.org 21 Nov '21

21 Nov '21

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.448.mcz ==================== Summary ==================== Name: Cog-eem.448 Author: eem Time: 20 November 2021, 10:16:30.198832 pm UUID: e6bb1c15-697d-434f-b09a-53afc0219839 Ancestors: Cog-eem.447 CogProcessorAlien: Factor in memoryOffset, allowing the SpurMemoryManager simulators to implement a nuill pointer trap by leaving out the first word in memory. =============== Diff against Cog-eem.447 =============== Item was changed: ----- Method: BochsIA32Alien>>handleCallFailureAt:in: (in category 'error handling') ----- handleCallFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a call into a ProcessorSimulationTrap signal." | relativeJump | + relativeJump := memoryArray longAt: pc + 2 - self primitiveMemoryOffset. - relativeJump := memoryArray longAt: pc + 2 bigEndian: false. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 5 address: (pc + 5 + relativeJump) signedIntToLong type: #call) signal! Item was changed: ----- Method: BochsIA32Alien>>handleExecutionPrimitiveFailureIn:minimumAddress: (in category 'error handling') ----- handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "Handle an execution primitive failure. Convert out-of-range call and absolute memory read into register instructions into ProcessorSimulationTrap signals." "self printIntegerRegistersOn: Transcript" "self printRegistersOn: Transcript" | pc opcode | ((pc := self eip) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: + [opcode := memoryArray byteAt: pc + 1 - self primitiveMemoryOffset. - [opcode := memoryArray byteAt: pc + 1. opcode ~= 16r0f ifTrue: [^self perform: (OpcodeExceptionMap at: opcode + 1) with: pc with: memoryArray]. + opcode := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset. - opcode := memoryArray byteAt: pc + 2. ^self perform: (ExtendedOpcodeExceptionMap at: opcode + 1) with: pc with: memoryArray]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsIA32Alien>>handleJmpFailureAt:in: (in category 'error handling') ----- handleJmpFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a jmp into a ProcessorSimulationTrap signal." | relativeJump | + relativeJump := memoryArray longAt: pc + 2 - self primitiveMemoryOffset. - relativeJump := memoryArray longAt: pc + 2 bigEndian: false. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 5 address: (pc + 5 + relativeJump) signedIntToLong type: #jump) signal! Item was changed: ----- Method: BochsIA32Alien>>handleMovALObFailureAt:in: (in category 'error handling') ----- handleMovALObFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a read into al into a ProcessorSimulationTrap signal." ^(ProcessorSimulationTrap pc: pc nextpc: pc + 5 + address: (memoryArray unsignedLongAt: pc + 2 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: pc + 2 bigEndian: false) type: #read accessor: #al:) signal! Item was changed: ----- Method: BochsIA32Alien>>handleMovAXOvFailureAt:in: (in category 'error handling') ----- handleMovAXOvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a read into eax into a ProcessorSimulationTrap signal." ^(ProcessorSimulationTrap pc: pc nextpc: pc + 5 + address: (memoryArray unsignedLongAt: pc + 2 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: pc + 2 bigEndian: false) type: #read accessor: #eax:) signal! Item was changed: ----- Method: BochsIA32Alien>>handleMovEbGbFailureAt:in: (in category 'error handling') ----- handleMovEbGbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." | modrmByte address | modrmByte := memoryArray byteAt: pc + 2. (modrmByte bitAnd: 7) ~= 4 ifTrue: "MoveRMbr with r = ESP requires an SIB byte" [address := (modrmByte bitAnd: 16rC0) caseOf: { [0 "ModRegInd"] + -> [memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset]. - -> [memoryArray unsignedLongAt: pc + 3 bigEndian: false]. [16r80 "ModRegRegDisp32"] -> [(self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) + + (memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset) - + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) bitAnd: 16rFFFFFFFF] } otherwise: [^self reportPrimitiveFailure]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 6 address: address type: #write accessor: (#(al cl dl bl ah ch dh bh) at: ((modrmByte >> 3 bitAnd: 7) + 1))) signal]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsIA32Alien>>handleMovEvGvFailureAt:in: (in category 'error handling') ----- handleMovEvGvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a register write into a ProcessorSimulationTrap signal." | modrmByte | + ^((modrmByte := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset) bitAnd: 16rC7) = 16r5 "ModRegInd & disp32" - ^((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC7) = 16r5 "ModRegInd & disp32" ifTrue: [(ProcessorSimulationTrap pc: pc nextpc: pc + 6 + address: (memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: pc + 3 bigEndian: false) type: #write accessor: (#(eax ecx edx ebx esp ebp esi edi) at: ((modrmByte >> 3 bitAnd: 7) + 1))) signal] ifFalse: [self reportPrimitiveFailure]! Item was changed: ----- Method: BochsIA32Alien>>handleMovGbEbFailureAt:in: (in category 'error handling') ----- handleMovGbEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a byte register load into a ProcessorSimulationTrap signal." | modrmByte address | modrmByte := memoryArray byteAt: pc + 2. address := (modrmByte bitAnd: 16rC0) caseOf: { [0 "ModRegInd"] + -> [memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset]. - -> [memoryArray unsignedLongAt: pc + 3 bigEndian: false]. [16r80 "ModRegRegDisp32"] -> [(self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) + + (memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset) - + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) bitAnd: 16rFFFFFFFF] } otherwise: [^self reportPrimitiveFailure]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 6 address: address type: #read accessor: (#(al: cl: dl: bl: ah: ch: dh: bh:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) signal! Item was changed: ----- Method: BochsIA32Alien>>handleMovGvEbFailureAt:in: (in category 'error handling') ----- handleMovGvEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a register load into a ProcessorSimulationTrap signal." | modrmByte mode srcIsSP srcVal dst offset | modrmByte := memoryArray byteAt: pc + 3. mode := modrmByte >> 6 bitAnd: 3. dst := #(eax: ecx: edx: ebx: esp: ebp: esi: edi:) at: ((modrmByte >> 3 bitAnd: 7) + 1). mode = 0 ifTrue: "ModRegInd" + [offset := memoryArray unsignedLongAt: pc + 4 - self primitiveMemoryOffset. "1-relative" - [offset := memoryArray unsignedLongAt: pc + 4. "1-relative" ^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 address: offset type: #read accessor: dst) signal]. srcIsSP := (modrmByte bitAnd: 7) = 4. srcVal := self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1). mode = 1 ifTrue: "ModRegRegDisp8" + [offset := memoryArray byteAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - self primitiveMemoryOffset). - [offset := memoryArray byteAt: pc + (srcIsSP ifTrue: [5] ifFalse: [4]). "1-relative" offset > 127 ifTrue: [offset := offset - 256]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + (srcIsSP ifTrue: [5] ifFalse: [4]) address: (srcVal + offset bitAnd: 16rFFFFFFFF) type: #read accessor: dst) signal]. mode = 2 ifTrue: "ModRegRegDisp32" + [offset := memoryArray unsignedLongAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - self primitiveMemoryOffset). - [offset := memoryArray unsignedLongAt: pc + (srcIsSP ifTrue: [5] ifFalse: [4]). "1-relative" ^(ProcessorSimulationTrap pc: pc nextpc: pc + (srcIsSP ifTrue: [8] ifFalse: [7]) address: (srcVal + offset bitAnd: 16rFFFFFFFF) type: #read accessor: dst) signal]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsIA32Alien>>handleMovGvEvFailureAt:in: (in category 'error handling') ----- handleMovGvEvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a register load into a ProcessorSimulationTrap signal." | modrmByte | + ^(((modrmByte := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset) bitAnd: 16rC7) = 16r5) "ModRegInd & disp32" - ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC7) = 16r5) "ModRegInd & disp32" ifTrue: [(ProcessorSimulationTrap pc: pc nextpc: pc + 6 + address: (memoryArray unsignedLongAt: pc + 3 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: pc + 3 bigEndian: false) type: #read accessor: (#(eax: ecx: edx: ebx: esp: ebp: esi: edi:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) signal] ifFalse: [self reportPrimitiveFailure]! Item was changed: ----- Method: BochsIA32Alien>>handleMovObALFailureAt:in: (in category 'error handling') ----- handleMovObALFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a byte write of al into a ProcessorSimulationTrap signal." ^(ProcessorSimulationTrap pc: pc nextpc: pc + 5 + address: (memoryArray unsignedLongAt: pc + 2 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: pc + 2 bigEndian: false) type: #write accessor: #al) signal! Item was changed: ----- Method: BochsIA32Alien>>handleMovOvAXFailureAt:in: (in category 'error handling') ----- handleMovOvAXFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a write of eax into a ProcessorSimulationTrap signal." ^(ProcessorSimulationTrap pc: pc nextpc: pc + 5 + address: (memoryArray unsignedLongAt: pc + 2 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: pc + 2 bigEndian: false) type: #write accessor: #eax) signal! Item was changed: ----- Method: BochsIA32Alien>>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." ^(ProcessorSimulationTrap pc: pc nextpc: pc + 1 + address: (memoryArray unsignedLongAt: self esp + 1 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: self esp + 1) type: #return accessor: #eip:) signal! Item was changed: ----- Method: BochsIA32Alien>>leafRetpcIn: (in category 'accessing-abstract') ----- leafRetpcIn: aMemory + ^aMemory unsignedLongAt: self esp + 1 - self primitiveMemoryOffset! - ^aMemory unsignedLongAt: self esp + 1 bigEndian: false! Item was changed: ----- Method: BochsIA32Alien>>popWordIn: (in category 'execution') ----- popWordIn: aMemory | sp word | + word := aMemory unsignedLongAt: (sp := self esp) + 1 - self primitiveMemoryOffset. - word := aMemory unsignedLongAt: (sp := self esp) + 1 bigEndian: false. self esp: sp + 4. ^word! Item was added: + ----- Method: BochsIA32Alien>>primitiveMemoryOffset (in category 'primitives') ----- + primitiveMemoryOffset + "Answer the memory offset. This may be non-zero to adapt to the SpurMemoryManager + simulators discarding the first work of memory to implement a null pointer trap." + <primitive: 'primitiveMemoryOffset' module: 'BochsIA32Plugin' error: ec> + ^self reportPrimitiveFailure! Item was added: + ----- Method: BochsIA32Alien>>primitiveSetMemoryOffset: (in category 'primitives') ----- + primitiveSetMemoryOffset: memoryOffset + "Set the memory offset. This may be non-zero to adapt to the SpurMemoryManager + simulators discarding the first work of memory to implement a null pointer trap. + Answer the previous value." + <primitive: 'primitiveMemoryOffset' module: 'BochsIA32Plugin' error: ec> + ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsIA32Alien>>pushWord:in: (in category 'execution') ----- pushWord: aValue in: aMemory | sp | sp := (self esp: self esp - 4). + aMemory longAt: sp + 1 - self primitiveMemoryOffset put: aValue bigEndian: false! - aMemory longAt: sp + 1 put: aValue bigEndian: false! Item was changed: ----- Method: BochsIA32Alien>>retpcIn: (in category 'accessing-abstract') ----- retpcIn: aMemory + ^aMemory unsignedLongAt: self ebp + 5 - self primitiveMemoryOffset! - ^aMemory unsignedLongAt: self ebp + 5 bigEndian: false! Item was changed: ----- Method: BochsX64Alien>>handleCallFailureAt:in:rex: (in category 'error handling') ----- handleCallFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a call into a ProcessorSimulationTrap signal." | relativeJump | self assert: rexByteOrNil isNil. + relativeJump := memoryArray longAt: pc + 2 - self primitiveMemoryOffset. - relativeJump := memoryArray longAt: pc + 2 bigEndian: false. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 5 address: (pc + 5 + relativeJump) signedIntToLong64 type: #call) signal! Item was changed: ----- Method: BochsX64Alien>>handleExecutionPrimitiveFailureIn:minimumAddress: (in category 'error handling') ----- handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "Handle an execution primitive failure. Convert out-of-range call and absolute memory read into register instructions into ProcessorSimulationTrap signals." "self printIntegerRegistersOn: Transcript" "self printRegistersOn: Transcript" + | pc opcode rexByteOrNil | - | pc opcode rexByteOrNil offset | ((pc := self rip) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: + [opcode := memoryArray byteAt: pc + 1 - self primitiveMemoryOffset. - [opcode := memoryArray byteAt: pc + (offset := 1). (opcode bitAnd: 16rF8) = self rexPrefix ifTrue: "skip rex prefix if present" [rexByteOrNil := opcode. + opcode := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset]. - opcode := memoryArray byteAt: pc + (offset := 2)]. ^self perform: (OpcodeExceptionMap at: opcode + 1) with: pc with: memoryArray with: rexByteOrNil]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsX64Alien>>handleGroup5FailureAt:in:rex: (in category 'error handling') ----- handleGroup5FailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a group 5 instruction into the relevant ProcessorSimulationTrap signal." | modrmByte getter | self assert: rexByteOrNil isNil. + modrmByte := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset. - modrmByte := memoryArray byteAt: pc + 2. (modrmByte >> 3 bitAnd: 7) caseOf: { [2 "Call Ev"] -> [getter := self registerStateGetters at: (modrmByte bitAnd: 7) + 1. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 2 address: (self perform: getter) type: #call) signal]. [4 "Jump Ev"] -> [getter := self registerStateGetters at: (modrmByte bitAnd: 7) + 1. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 2 address: (self perform: getter) type: #jump) + signal] } + otherwise: [self reportPrimitiveFailure]! - signal] }! Item was changed: ----- Method: BochsX64Alien>>handleGroup6through10FailureAt:in:rex: (in category 'error handling') ----- handleGroup6through10FailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" + "Convert an execution primitive failure for a group 6 instruction into the relevant ProcessorSimulationTrap signal." - "Convert an execution primitive failure for a group 5 instruction into the relevant ProcessorSimulationTrap signal." | rexByte modrmByte baseReg srcReg | + (((rexByte := memoryArray byteAt: pc + 2 - self primitiveMemoryOffset) bitAnd: 16rF8) = self rexPrefix + and: [(memoryArray byteAt: pc + 3 - self primitiveMemoryOffset) = 16r0F + and: [(memoryArray byteAt: pc + 4 - self primitiveMemoryOffset) = 16rB1]]) ifTrue: + [modrmByte := memoryArray byteAt: pc + 5 - self primitiveMemoryOffset. - (((rexByte := memoryArray byteAt: pc + 2) bitAnd: 16rF8) = self rexPrefix - and: [(memoryArray byteAt: pc + 3) = 16r0F - and: [(memoryArray byteAt: pc + 4) = 16rB1]]) ifTrue: - [modrmByte := memoryArray byteAt: pc + 5. modrmByte >> 6 = 0 ifTrue: "ModRegInd" [srcReg := (modrmByte >> 3 bitAnd: 7) + ((rexByte bitAnd: 4) bitShift: 1). baseReg := (modrmByte bitAnd: 7) + ((rexByte bitAnd: 1) bitShift: 3). ^(CompareAndSwapSimulationTrap pc: pc nextpc: pc + 5 address: (self perform: (self registerStateGetters at: baseReg + 1)) type: #write accessor: (self registerStateSetters at: srcReg + 1)) failedComparisonRegisterAccessor: #rax:; expectedValue: self rax; storedValue: (self perform: (self registerStateGetters at: srcReg + 1)); + signal]]. + self reportPrimitiveFailure! - signal]]! Item was changed: ----- Method: BochsX64Alien>>handleJmpFailureAt:in:rex: (in category 'error handling') ----- handleJmpFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a jmp into a ProcessorSimulationTrap signal." | relativeJump | self assert: rexByteOrNil isNil. + relativeJump := memoryArray longAt: pc + 2 - self primitiveMemoryOffset. - relativeJump := memoryArray longAt: pc + 2 bigEndian: false. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 5 address: (pc + 5 + relativeJump) signedIntToLong64 type: #jump) signal! Item was changed: ----- Method: BochsX64Alien>>handleMovALObFailureAt:in:rex: (in category 'error handling') ----- handleMovALObFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a read into al into a ProcessorSimulationTrap signal." rexByteOrNil ifNotNil: [self assert: rexByteOrNil = 16r48. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 10 + address: (memoryArray unsignedLong64At: pc + 3 - self primitiveMemoryOffset) - address: (memoryArray unsignedLong64At: pc + 3) type: #read accessor: #al:) signal]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 5 + address: (memoryArray unsignedLongAt: pc + 2 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: pc + 2) type: #read accessor: #al:) signal! Item was changed: ----- Method: BochsX64Alien>>handleMovAXOvFailureAt:in:rex: (in category 'error handling') ----- handleMovAXOvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a read into rax/eax into a ProcessorSimulationTrap signal." rexByteOrNil ifNotNil: [self assert: rexByteOrNil = 16r48. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 10 + address: (memoryArray unsignedLong64At: pc + 3 - self primitiveMemoryOffset) - address: (memoryArray unsignedLong64At: pc + 3) type: #read accessor: #rax:) signal]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 5 + address: (memoryArray unsignedLongAt: pc + 2 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: pc + 2) type: #read accessor: #eax:) signal! Item was changed: ----- Method: BochsX64Alien>>handleMovEbGbFailureAt:in:rex: (in category 'error handling') ----- handleMovEbGbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." | modrmByte offset size baseReg srcReg | modrmByte := memoryArray byteAt: pc + 3. (modrmByte bitAnd: 16rC0) caseOf: { + [16r80 "ModRegRegDisp32"] -> [offset := memoryArray unsignedLongAt: pc + 4 - self primitiveMemoryOffset. - [16r80 "ModRegRegDisp32"] -> [offset := memoryArray unsignedLongAt: pc + 4 bigEndian: false. size := 7]. + [16r40 "ModRegRegDisp8"] -> [offset := memoryArray byteAt: pc + 4 - self primitiveMemoryOffset. - [16r40 "ModRegRegDisp8"] -> [offset := memoryArray byteAt: pc + 4. offset > 127 ifTrue: [offset := offset - 256]. size := 4]. [16r0 "ModRegInd"] -> [offset := 0. size := 3]} otherwise: [self reportPrimitiveFailure]. srcReg := (modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) bitShift: 1). baseReg := (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) bitShift: 3). ^(ProcessorSimulationTrap pc: pc nextpc: pc + size address: (((self perform: (self registerStateGetters at: baseReg + 1)) + offset) bitAnd: 16rFFFFFFFFFFFFFFFF) type: #write accessor: (#(al cl dl bl spl bpl sil dil r8l r9l r10l r11l r12l r13l r14l r15l) at: srcReg + 1)) signal! Item was changed: ----- Method: BochsX64Alien>>handleMovEvGvFailureAt:in:rex: (in category 'error handling') ----- handleMovEvGvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a register write into a ProcessorSimulationTrap signal." | modrmByte getter base offset | self assert: rexByteOrNil notNil. + modrmByte := memoryArray byteAt: pc + 3 - self primitiveMemoryOffset. - modrmByte := memoryArray byteAt: pc + 3. getter := self registerStateGetters at: (modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) << 1) + 1. (modrmByte bitAnd: 16rC7) = 16r5 ifTrue: "ModRegInd & disp32" [^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 + address: (memoryArray unsignedLongAt: pc + 4 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: pc + 4 bigEndian: false) type: #write accessor: getter) signal]. (modrmByte bitAnd: 16rC0) = 0 ifTrue: "ModRegInd" [base := self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 3 address: (self perform: base) type: #write accessor: getter) signal]. (modrmByte bitAnd: 16rC0) = 16r80 ifTrue: "ModRegRegDisp32" + [offset := memoryArray longAt: pc + 4 - self primitiveMemoryOffset. - [offset := memoryArray longAt: pc + 4 bigEndian: false. base := self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 address: (self perform: base) + offset type: #write accessor: getter) signal]. (modrmByte bitAnd: 16rC0) = 16r40 ifTrue: "ModRegRegDisp8" + [offset := memoryArray unsignedByteAt: pc + 4 - self primitiveMemoryOffset. - [offset := memoryArray unsignedByteAt: pc + 4. offset > 127 ifTrue: [offset := offset - 256]. base := self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: (self perform: base) + offset type: #write accessor: getter) signal]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsX64Alien>>handleMovGbEbFailureAt:in:rex: (in category 'error handling') ----- handleMovGbEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a byte register load into a ProcessorSimulationTrap signal." | modrmByte offset size | + modrmByte := memoryArray byteAt: pc + 3 - self primitiveMemoryOffset. - modrmByte := memoryArray byteAt: pc + 3. (modrmByte bitAnd: 16rC0) caseOf: { + [16r80 "ModRegRegDisp32"] -> [offset := memoryArray unsignedLongAt: pc + 4 - self primitiveMemoryOffset. - [16r80 "ModRegRegDisp32"] -> [offset := memoryArray unsignedLongAt: pc + 4 bigEndian: false. size := 7]. [16r40 "ModRegRegDisp8"] -> [offset := memoryArray byteAt: pc + 4. offset > 127 ifTrue: [offset := offset - 256]. size := 4] } otherwise: [self reportPrimitiveFailure]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + size address: (((self perform: (self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) bitShift: 3) + 1)) + offset) bitAnd: 16rFFFFFFFFFFFFFFFF) type: #read accessor: (#(al: cl: dl: bl: spl: bpl: sil: dil: r8l: r9l: r10l: r11l: r12l: r13l: r14l: r15l:) at: ((modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) bitShift: 1) + 1))) signal! Item was changed: ----- Method: BochsX64Alien>>handleMovGvEbFailureAt:in:rex: (in category 'error handling') ----- handleMovGvEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a register load into a ProcessorSimulationTrap signal." | modrmByte mode srcIsSP srcVal dst offset | self shouldBeImplemented. modrmByte := memoryArray byteAt: pc + 3. mode := modrmByte >> 6 bitAnd: 3. srcIsSP := (modrmByte bitAnd: 7) = 4. srcVal := self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1). dst := #(eax: ecx: edx: ebx: esp: ebp: esi: edi:) at: ((modrmByte >> 3 bitAnd: 7) + 1). mode = 1 ifTrue: "ModRegRegDisp8" + [offset := memoryArray byteAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - self primitiveMemoryOffset). - [offset := memoryArray byteAt: pc + (srcIsSP ifTrue: [5] ifFalse: [4]). "1-relative" offset > 127 ifTrue: [offset := offset - 256]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + (srcIsSP ifTrue: [5] ifFalse: [4]) address: ((srcVal + offset) bitAnd: 16rFFFFFFFF) type: #read accessor: dst) signal]. mode = 2 ifTrue: "ModRegRegDisp32" + [offset := memoryArray unsignedLongAt: pc + ((srcIsSP ifTrue: [5] ifFalse: [4] "1-relative") - self primitiveMemoryOffset). - [offset := memoryArray unsignedLongAt: pc + (srcIsSP ifTrue: [5] ifFalse: [4]). "1-relative" ^(ProcessorSimulationTrap pc: pc nextpc: pc + (srcIsSP ifTrue: [8] ifFalse: [7]) address: ((srcVal + offset) bitAnd: 16rFFFFFFFF) type: #read accessor: dst) signal]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsX64Alien>>handleMovGvEvFailureAt:in:rex: (in category 'error handling') ----- handleMovGvEvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a register load into a ProcessorSimulationTrap signal." | modrmByte getter setter offset | self assert: rexByteOrNil notNil. + modrmByte := memoryArray byteAt: pc + 3 - self primitiveMemoryOffset. - modrmByte := memoryArray byteAt: pc + 3. setter := self registerStateSetters at: ((modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) << 1) + 1). (modrmByte bitAnd: 16rC7) = 16r5 ifTrue: "ModRegInd & disp32" [^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 + address: (memoryArray unsignedLongAt: pc + 4 - self primitiveMemoryOffset) - address: (memoryArray unsignedLongAt: pc + 4 bigEndian: false) type: #read accessor: setter) signal]. getter := self registerStateGetters at: ((modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1). (modrmByte bitAnd: 16rC0) = 16r80 ifTrue: "ModRegRegDisp32" + [offset := memoryArray longAt: pc + 4 - self primitiveMemoryOffset. - [offset := memoryArray longAt: pc + 4 bigEndian: false. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 address: (self perform: getter) + offset type: #read accessor: setter) signal]. (modrmByte bitAnd: 16rC0) = 16r40 ifTrue: "ModRegRegDisp8" + [offset := memoryArray byteAt: pc + 4 - self primitiveMemoryOffset. - [offset := memoryArray byteAt: pc + 4. offset > 16r7F ifTrue: [offset := offset - 16r100]. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: (self perform: getter) + offset type: #read accessor: setter) signal]. (modrmByte bitAnd: 16rC0) = 16r00 ifTrue: "ModRegInd" [^(ProcessorSimulationTrap pc: pc nextpc: pc + 3 address: (self perform: getter) type: #read accessor: setter) signal]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsX64Alien>>handleMovObALFailureAt:in:rex: (in category 'error handling') ----- handleMovObALFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a write of al into a ProcessorSimulationTrap signal." self assert: rexByteOrNil = 16r48. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 10 + address: (memoryArray unsignedLong64At: pc + 3 - self primitiveMemoryOffset) - address: (memoryArray unsignedLong64At: pc + 3) type: #write accessor: #al) signal! Item was changed: ----- Method: BochsX64Alien>>handleMovOvAXFailureAt:in:rex: (in category 'error handling') ----- handleMovOvAXFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a write of rax into a ProcessorSimulationTrap signal." self assert: rexByteOrNil = 16r48. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 10 + address: (memoryArray unsignedLong64At: pc + 3 - self primitiveMemoryOffset) - address: (memoryArray unsignedLong64At: pc + 3) type: #write accessor: #rax) signal! Item was changed: ----- Method: BochsX64Alien>>handleRetFailureAt:in:rex: (in category 'error handling') ----- handleRetFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a ret into a ProcessorSimulationTrap signal." self shouldBeImplemented. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 1 + address: (memoryArray unsignedLong64At: self rsp + 1 - self primitiveMemoryOffset) - address: (memoryArray unsignedLong64At: self rsp + 1) type: #return accessor: #rip:) signal! Item was changed: ----- Method: BochsX64Alien>>handleTwoByteEscapeFailureAt:in:rex: (in category 'error handling') ----- handleTwoByteEscapeFailureAt: pc in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "Handle an execution primitive failure for the 0f prefix. Convert failures into ProcessorSimulationTrap signals." "self printIntegerRegistersOn: Transcript" "self printRegistersOn: Transcript" + | opcode | - | opcode offset | "assume 0fh opcode or 0fh rex opcode" + opcode := memoryArray byteAt: pc + (rexByteOrNil ifNil: [2] ifNotNil: [3] "1 relative") - self primitiveMemoryOffset. - offset := rexByteOrNil ifNil: [1] ifNotNil: [2]. - opcode := memoryArray byteAt: pc + offset + 1. ^self perform: (ExtendedOpcodeExceptionMap at: opcode + 1) with: pc with: memoryArray with: rexByteOrNil! Item was changed: ----- Method: BochsX64Alien>>popWordIn: (in category 'execution') ----- popWordIn: aMemory | sp word | + word := aMemory long64At: (sp := self rsp) + 1 - self primitiveMemoryOffset. - word := aMemory long64At: (sp := self rsp) + 1. self rsp: sp + 8. ^word! Item was added: + ----- Method: BochsX64Alien>>primitiveMemoryOffset (in category 'primitives') ----- + primitiveMemoryOffset + "Answer the memory offset. This may be non-zero to adapt to the SpurMemoryManager + simulators discarding the first work of memory to implement a null pointer trap." + <primitive: 'primitiveMemoryOffset' module: 'BochsX64Plugin' error: ec> + ^self reportPrimitiveFailure! Item was added: + ----- Method: BochsX64Alien>>primitiveSetMemoryOffset: (in category 'primitives') ----- + primitiveSetMemoryOffset: memoryOffset + "Set the memory offset. This may be non-zero to adapt to the SpurMemoryManager + simulators discarding the first work of memory to implement a null pointer trap. + Answer the previous value." + <primitive: 'primitiveMemoryOffset' module: 'BochsX64Plugin' error: ec> + ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsX64Alien>>pushWord:in: (in category 'execution') ----- pushWord: aValue in: aMemory | sp | + sp := self rsp: self rsp - 8. + aMemory long64At: sp + 1 - self primitiveMemoryOffset put: aValue! - sp := (self rsp: self rsp - 8). - aMemory long64At: sp + 1 put: aValue! Item was changed: ----- Method: BochsX64Alien>>retpcIn: (in category 'accessing-abstract') ----- retpcIn: aMemory + ^aMemory long64At: self rbp + 9 - self primitiveMemoryOffset! - ^aMemory long64At: self rbp + 9! Item was added: + ----- Method: CogProcessorAlien>>memoryOffset (in category 'Cog API') ----- + memoryOffset + "Answer the memory offset. This may be non-zero to adapt to the SpurMemoryManager + simulators discarding the first work of memory to implement a null pointer trap." + ^self primitiveMemoryOffset! Item was added: + ----- Method: CogProcessorAlien>>memoryOffset: (in category 'Cog API') ----- + memoryOffset: anInteger + "Set the memory offset. This may be non-zero to adapt to the SpurMemoryManager + simulators discarding the first work of memory to implement a null pointer trap. + Answer the previous value." + ^self primitiveSetMemoryOffset: anInteger! 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" | pcOnEntry pc instr | pc := pcOnEntry := self pc. self endCondition = InstructionPrefetchError ifTrue: [pc := self pc: self priorPc]. (pc between: minimumAddress and: memoryArray byteSize - 1) ifTrue: + [instr := memoryArray unsignedLongAt: pc + 1 - self primitiveMemoryOffset. - [instr := memoryArray unsignedLongAt: pc + 1 bigEndian: false. (self endCondition = InstructionPrefetchError) ifTrue: [^self handleFailingBranch: instr to: pcOnEntry at: pc]. (self instructionIsAnyLoadStore: instr) ifTrue: [^self handleFailingLoadStore: instr at: pc]. (self instructionIsAnyFPArithmetic: instr) ifTrue: [^self handleFailingFPArithmetic: instr at: pc]. ^self handleExecutionPrimitiveFailureAt: pc in: memoryArray]. ^self reportPrimitiveFailure! Item was changed: ----- Method: GdbARMAlien>>handleExecutionPrimitiveFailureIn:minimumAddress:code: (in category 'error handling') ----- handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>"code: errorCode "<Integer>" "Handle an execution primitive failure. Convert out-of-range call and absolute memory read into register instructions into ProcessorSimulationTrap signals." "self printRegistersOn: Transcript" | pcOnEntry pc instr | pc := pcOnEntry := self pc. errorCode = InstructionPrefetchError ifTrue: [pc := self pc: self priorPc]. (pc between: minimumAddress and: memoryArray byteSize - 1) ifTrue: + [instr := memoryArray unsignedLongAt: pc + 1 - self primitiveMemoryOffset. - [instr := memoryArray unsignedLongAt: pc + 1 bigEndian: false. errorCode = InstructionPrefetchError ifTrue: [^self handleFailingBranch: instr to: pcOnEntry at: pc]. (self instructionIsAnyLoadStore: instr) ifTrue: [^self handleFailingLoadStore: instr at: pc]. (self instructionIsAnyFPArithmetic: instr) ifTrue: + [^self handleFailingFPArithmetic: instr at: pc]]. - [^self handleFailingFPArithmetic: instr at: pc]. - ^self handleExecutionPrimitiveFailureAt: pc in: memoryArray]. - ^self reportPrimitiveFailure! Item was changed: ----- Method: GdbARMAlien>>popWordIn: (in category 'execution') ----- popWordIn: aMemory | sp word | + word := aMemory unsignedLongAt: (sp := self sp) + 1 - self primitiveMemoryOffset. - word := aMemory unsignedLongAt: (sp := self sp) + 1 bigEndian: false. self sp: sp + 4. ^word! Item was added: + ----- Method: GdbARMAlien>>primitiveMemoryOffset (in category 'primitives') ----- + primitiveMemoryOffset + "Answer the memory offset. This may be non-zero to adapt to the SpurMemoryManager + simulators discarding the first work of memory to implement a null pointer trap." + <primitive: 'primitiveMemoryOffset' module: 'GdbARMPlugin' error: ec> + ^self reportPrimitiveFailure! Item was added: + ----- Method: GdbARMAlien>>primitiveSetMemoryOffset: (in category 'primitives') ----- + primitiveSetMemoryOffset: memoryOffset + "Set the memory offset. This may be non-zero to adapt to the SpurMemoryManager + simulators discarding the first work of memory to implement a null pointer trap. + Answer the previous value." + <primitive: 'primitiveMemoryOffset' module: 'GdbARMPlugin' error: ec> + ^self reportPrimitiveFailure! Item was changed: ----- Method: GdbARMAlien>>pushWord:in: (in category 'execution') ----- pushWord: aValue in: aMemory + aMemory longAt: (self sp: self sp - 4) + 1 - self primitiveMemoryOffset put: aValue bigEndian: false! - aMemory longAt: (self sp: self sp - 4) + 1 put: aValue bigEndian: false! Item was changed: ----- Method: GdbARMAlien>>retpcIn: (in category 'accessing-abstract') ----- retpcIn: aMemory "The return address is on the stack, having been pushed by either simulateCallOf:nextpc:memory: or simulateJumpCallOf:memory:" + ^aMemory unsignedLongAt: self fp + 5 - self primitiveMemoryOffset! - ^aMemory unsignedLongAt: self fp + 5 bigEndian: false! Item was changed: ----- Method: GdbARMv8Alien class>>initialize (in category 'class initialization') ----- initialize "Initialize the execution failure dispatch table. This is organized around op0 in C4.1 of the Arm ARM. Each tuple is a type and a failure routine, or nil of not needed to be handled as an execution failure." "self initialize" Level0FailureTable := #( "0" nil nil nil nil + "4" (LDST handleFailingLoadStore:at:) - "4" (LDST handleFailingLoadStore:at:in:) "5" nil + "6" (LDST handleFailingLoadStore:at:) - "6" (LDST handleFailingLoadStore:at:in:) "7" nil nil nil + "a" (BR handleFailingBranch:at:) + "b" (BR handleFailingBranch:at:) + "c" (LDST handleFailingLoadStore:at:) - "a" (BR handleFailingBranch:at:in:) - "b" (BR handleFailingBranch:at:in:) - "c" (LDST handleFailingLoadStore:at:in:) "d" nil + "e" (LDST handleFailingLoadStore:at:) - "e" (LDST handleFailingLoadStore:at:in:) nil). "At least Raspberry Pi 4 running Manjaro allows access to EL1 level system registers... These values are derived from the program in https://android.googlesource.com/kernel/common/+/refs/tags/ASB-2019-03-05_4… run on a raspberry Pi 4 Model B" ID_AA64ISAR0_EL1 := 16r00010000. ID_AA64ISAR1_EL1 := 16r00000000. ID_AA64MMFR0_EL1 := 16rFF000000. ID_AA64MMFR1_EL1 := 16r00000000. ID_AA64PFR0_EL1 := 16r00000011. ID_AA64PFR1_EL1 := 16r00000000. ID_AA64DFR0_EL1 := 16r00000006. ID_AA64DFR1_EL1 := 16r00000000 ! Item was changed: ----- Method: GdbARMv8Alien>>handleExecutionPrimitiveFailureIn:minimumAddress:code: (in category 'error handling') ----- handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" code: errorCode "<Integer>" "Handle an execution primitive failure. Convert out-of-range call and absolute memory read into register instructions into ProcessorSimulationTrap signals." "self disassembleInstructionAt: self pc In: memoryArray" | instr pc op | pc := self pc. instr := self instr. + "(pc between: minimumAddress and: memoryArray byteSize - 1) ifTrue: + [self assert: instr = (memoryArray unsignedLongAt: pc + 1 - self primitiveGetMemoryOffset)]." - (pc between: minimumAddress and: memoryArray byteSize - 1) ifTrue: - [self assert: instr = (memoryArray unsignedLongAt: pc + 1 bigEndian: false)]. op := instr >> 25 bitAnd: 16rF. (Level0FailureTable at: op + 1) ifNotNil: [:tuple| + ^self perform: (tuple at: 2) with: instr with: pc]. - ^self perform: (tuple at: 2) with: instr with: pc with: memoryArray]. ^self reportPrimitiveFailure! Item was added: + ----- Method: GdbARMv8Alien>>handleFailingBranch:at: (in category 'error handling') ----- + handleFailingBranch: instruction at: pc + "see C4.1.3 Branches, Exception Generating and System instructions in Arm ARM. + Table C4-4 op1 plus the two top bit of op1" + | opcOp2Op3Op4 op1CRnCRmOp2 | + "self disassembleInstructionAt: self pc In: memoryArray" + (instruction bitShift: -25) = 2r1101011 ifTrue: "Unconditional branch (register) on page C4-262" + [opcOp2Op3Op4 := instruction bitAnd: 2r1111111111111110000011111. + opcOp2Op3Op4 = 2r10111110000000000000000 ifTrue: "RET" + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: self lr + type: #return) + signal]. + opcOp2Op3Op4 = 2r1111110000000000000000 ifTrue: "BLR" + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (self perform: (self registerStateGetters at: ((instruction >> 5) bitAnd: 31) + 1)) + type: #call) + signal]. + opcOp2Op3Op4 = 2r0111110000000000000000 ifTrue: "BR" + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (self perform: (self registerStateGetters at: ((instruction >> 5) bitAnd: 31) + 1)) + type: #jump) + signal]]. + instruction = self clrexOpcode ifTrue: + [self pc: pc + 4. + ^self]. + (instruction bitShift: -19) = 2r1101010100111 ifTrue: "MRS Op0=3" + [op1CRnCRmOp2 := instruction bitAnd: 2r1111111111111100000. + "At least Raspberry Pi 4 running Manjaro allows access to ID_AA64ISAR0_EL1" + op1CRnCRmOp2 = 2r11000000000 ifTrue: + [self perform: (self registerStateSetters at: (instruction bitAnd: 31) + 1) with: ID_AA64ISAR0_EL1. + self pc: pc + 4. + ^self]]. + self reportPrimitiveFailure! Item was removed: - ----- Method: GdbARMv8Alien>>handleFailingBranch:at:in: (in category 'error handling') ----- - handleFailingBranch: instruction at: pc in: memoryArray "<DoubleWordArray|ByteArray>" - "see C4.1.3 Branches, Exception Generating and System instructions in Arm ARM. - Table C4-4 op1 plus the two top bit of op1" - | opcOp2Op3Op4 op1CRnCRmOp2 | - "self disassembleInstructionAt: self pc In: memoryArray" - (instruction bitShift: -25) = 2r1101011 ifTrue: "Unconditional branch (register) on page C4-262" - [opcOp2Op3Op4 := instruction bitAnd: 2r1111111111111110000011111. - opcOp2Op3Op4 = 2r10111110000000000000000 ifTrue: "RET" - [^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: self lr - type: #return) - signal]. - opcOp2Op3Op4 = 2r1111110000000000000000 ifTrue: "BLR" - [^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: (self perform: (self registerStateGetters at: ((instruction >> 5) bitAnd: 31) + 1)) - type: #call) - signal]. - opcOp2Op3Op4 = 2r0111110000000000000000 ifTrue: "BR" - [^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: (self perform: (self registerStateGetters at: ((instruction >> 5) bitAnd: 31) + 1)) - type: #jump) - signal]]. - instruction = self clrexOpcode ifTrue: - [self pc: pc + 4. - ^self]. - (instruction bitShift: -19) = 2r1101010100111 ifTrue: "MRS Op0=3" - [op1CRnCRmOp2 := instruction bitAnd: 2r1111111111111100000. - "At least Raspberry Pi 4 running Manjaro allows access to ID_AA64ISAR0_EL1" - op1CRnCRmOp2 = 2r11000000000 ifTrue: - [self perform: (self registerStateSetters at: (instruction bitAnd: 31) + 1) with: ID_AA64ISAR0_EL1. - self pc: pc + 4. - ^self]]. - self reportPrimitiveFailure! Item was added: + ----- Method: GdbARMv8Alien>>handleFailingLoadStore:at: (in category 'error handling') ----- + handleFailingLoadStore: instruction at: pc + "C4.1.4 Loads and Stores C4-266 + This section describes the encoding of the Loads and Stores group. The encodings in this section are decoded from A64 instruction set encoding on page C4-252. + + Table C4-5 Encoding table for the Loads and Stores group + + op0 31:28 1 op1 26 0 op2 24:23 x op3 21:16 x op4 11:10 + + op0 op2 op3 op4 + xx11 0x 0xxxxx 00 Load/store register (unscaled immediate) on page C4-283 + xx11 0x 0xxxxx 01 Load/store register (immediate post-indexed) on page C4-284 + xx11 0x 0xxxxx 10 Load/store register (unprivileged) on page C4-286 + xx11 0x 0xxxxx 11 Load/store register (immediate pre-indexed) on page C4-286 + xx11 0x 1xxxxx 00 Atomic memory operations on page C4-288 + xx11 0x 1xxxxx 10 Load/store register (register offset) on page C4-295 + xx11 0x 1xxxxx x1 Load/store register (pac) on page C4-297 + xx11 1x 1xxxxx - Load/store register (unsigned immediate) on page C4-297 + + Load/store exclusive table starts on page C4-277 (. implies a bit) + |size..|0 0 1 0 0 0|o2.|L.|o1.|Rs.....|o0.|Rt2.....|Rn.....|Rt.....| + o2 = bit 23, L=bit 22, o1 = bit 21, o0 = bit 15" + + | op0op2 size op4 rm rn rt opc v offsetFromImm addr shift | + "self disassembleInstructionAt: self pc In: memoryArray" + size := instruction bitShift: -30. + opc := (instruction bitShift: -22) bitAnd: 3. + op4 := (instruction bitShift: -10) bitAnd: 3. + rn := (instruction bitShift: -5) bitAnd: 31. + rt := instruction bitAnd: 31. + (rn = 31 and: [self sp anyMask: 15]) ifTrue: + [self reportStackAlignmentVolation]. + "op0 = xx11 op2 = 0x" + (op0op2 := (instruction bitShift: -23) bitAnd: 2r1100010) = 2r1100000 ifFalse: + [offsetFromImm := ARMv8A64Opcodes extractOffsetFromLoadStore: instruction. + (v := instruction >> 26 bitAnd: 1) = 0 ifFalse: [self halt]. + addr := (self perform: (self registerStateGetters at: rn + 1)) + offsetFromImm. + op0op2 = 2r1100010 ifTrue: "Load/store register (unsigned immediate) on page C4-297" + [^(opc = 0 + ifTrue: + [ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + type: #write + accessor: ((self registerStateGettersForSizes: size) at: rt + 1)] + ifFalse: + [ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + type: #read + accessor: ((self registerStateSettersForSizes: size) at: rt + 1)]) + signal]. + op0op2 = 2r1000010 ifTrue: "Load/store register pair (signed immediate) on page C4-282" + [| rt2 | + rt2 := (instruction bitShift: -10) bitAnd: 31. + ^opc = 0 + ifTrue: + [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + type: #write + accessor: ((self registerStateGettersForSizes: size + 1) at: rt + 1)) + signal. + (ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + 8 + type: #write + accessor: ((self registerStateGettersForSizes: size + 1) at: rt2 + 1)) + signal] + ifFalse: + [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + type: #read + accessor: ((self registerStateSettersForSizes: size + 1) at: rt + 1)) + signal. + (ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + 8 + type: #read + accessor: ((self registerStateSettersForSizes: size + 1) at: rt2 + 1)) + signal]]. + + op0op2 = 0 ifTrue: "LDAXR/STLXR register on page C4-279" + [| result rs | + self assert: size = 3. + opc = 1 ifTrue: + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + type: #read + accessor: (self registerStateSetters at: rt + 1)) signal]. + opc = 0 ifTrue: + [result := (ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + type: #write + accessor: (self registerStateGetters at: rt + 1)) signal. + rs := instruction >> 16 bitAnd: 31. + "For now assume the write succeeded..." + self perform: ((self registerStateSettersForSizes: 2) at: rs + 1) + with: 0. + ^result]]]. + + ((instruction bitShift: -21) noMask: 1) ifTrue: "op3 = 0xxxxx" + [offsetFromImm := ((instruction bitShift: -12) bitAnd: 16r1FF) bitShift: size. + opc = 0 ifTrue:"C4-286 opc = 0 => store" + [self assert: size = 3. + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (self perform: (self registerStateGetters at: rn + 1)) + offsetFromImm + type: #write + accessor: (self registerStateGetters at: rt + 1)) + signal]. + opc = 1 ifTrue: + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (self perform: (self registerStateGetters at: rn + 1)) + offsetFromImm + type: #read + accessor: ((self registerStateSettersForSizes: size) at: rt + 1)) + signal]. + self halt: 'op3 = 0xxxxx opc > 1']. + + "op0 op2 op3 op4 + xx11 0x 1xxxxx 10 Load/store register (register offset) on page C4-295 (296/297)" + + v := instruction >> 26 bitAnd: 1. + rm := instruction >> 16 bitAnd: 31. + shift := instruction anyMask: 1 << 12. + (size = 3 and: [v = 0]) ifTrue: + [addr := (self perform: (self registerStateGetters at: rn + 1)) + + (shift + ifTrue: [(self perform: (self registerStateGetters at: rm + 1)) << size] + ifFalse: [self perform: (self registerStateGetters at: rm + 1)]). + opc = 0 ifTrue: "STR (register) - 64-bit variant on page C6-1242" + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + type: #write + accessor: (self registerStateGetters at: rt + 1)) + signal]. + opc = 1 ifTrue: "LDR (register) - 64-bit variant on page C6-981" + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + type: #read + accessor: (self registerStateSetters at: rt + 1)) + signal]. + (opc = 3 and: [instruction >> 10 allMask: 63]) ifTrue: "CASAL C4-278/C6-829" + [^(CompareAndSwapSimulationTrap + pc: pc + nextpc: pc + 4 + address: (self perform: (self registerStateGetters at: rn + 1)) + type: #write + accessor: (self registerStateSetters at: rm + 1)) + expectedValue: (self perform: (self registerStateGetters at: rm + 1)); + storedValue: (self perform: (self registerStateGetters at: rt + 1)); + signal]. + self halt: 'op3 = 1xxxxx opc > 1']. + self halt: 'op3 = 1xxxxx size ~= 3'! Item was removed: - ----- Method: GdbARMv8Alien>>handleFailingLoadStore:at:in: (in category 'error handling') ----- - handleFailingLoadStore: instruction at: pc in: memoryArray "<DoubleWordArray|ByteArray>" - "C4.1.4 Loads and Stores C4-266 - This section describes the encoding of the Loads and Stores group. The encodings in this section are decoded from A64 instruction set encoding on page C4-252. - - Table C4-5 Encoding table for the Loads and Stores group - - op0 31:28 1 op1 26 0 op2 24:23 x op3 21:16 x op4 11:10 - - op0 op2 op3 op4 - xx11 0x 0xxxxx 00 Load/store register (unscaled immediate) on page C4-283 - xx11 0x 0xxxxx 01 Load/store register (immediate post-indexed) on page C4-284 - xx11 0x 0xxxxx 10 Load/store register (unprivileged) on page C4-286 - xx11 0x 0xxxxx 11 Load/store register (immediate pre-indexed) on page C4-286 - xx11 0x 1xxxxx 00 Atomic memory operations on page C4-288 - xx11 0x 1xxxxx 10 Load/store register (register offset) on page C4-295 - xx11 0x 1xxxxx x1 Load/store register (pac) on page C4-297 - xx11 1x 1xxxxx - Load/store register (unsigned immediate) on page C4-297 - - Load/store exclusive table starts on page C4-277 (. implies a bit) - |size..|0 0 1 0 0 0|o2.|L.|o1.|Rs.....|o0.|Rt2.....|Rn.....|Rt.....| - o2 = bit 23, L=bit 22, o1 = bit 21, o0 = bit 15" - - | op0op2 size op4 rm rn rt opc v offsetFromImm addr shift | - "self disassembleInstructionAt: self pc In: memoryArray" - size := instruction bitShift: -30. - opc := (instruction bitShift: -22) bitAnd: 3. - op4 := (instruction bitShift: -10) bitAnd: 3. - rn := (instruction bitShift: -5) bitAnd: 31. - rt := instruction bitAnd: 31. - (rn = 31 and: [self sp anyMask: 15]) ifTrue: - [self reportStackAlignmentVolation]. - "op0 = xx11 op2 = 0x" - (op0op2 := (instruction bitShift: -23) bitAnd: 2r1100010) = 2r1100000 ifFalse: - [offsetFromImm := ARMv8A64Opcodes extractOffsetFromLoadStore: instruction. - (v := instruction >> 26 bitAnd: 1) = 0 ifFalse: [self halt]. - addr := (self perform: (self registerStateGetters at: rn + 1)) + offsetFromImm. - op0op2 = 2r1100010 ifTrue: "Load/store register (unsigned immediate) on page C4-297" - [^(opc = 0 - ifTrue: - [ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr - type: #write - accessor: ((self registerStateGettersForSizes: size) at: rt + 1)] - ifFalse: - [ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr - type: #read - accessor: ((self registerStateSettersForSizes: size) at: rt + 1)]) - signal]. - op0op2 = 2r1000010 ifTrue: "Load/store register pair (signed immediate) on page C4-282" - [| rt2 | - rt2 := (instruction bitShift: -10) bitAnd: 31. - ^opc = 0 - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr - type: #write - accessor: ((self registerStateGettersForSizes: size + 1) at: rt + 1)) - signal. - (ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr + 8 - type: #write - accessor: ((self registerStateGettersForSizes: size + 1) at: rt2 + 1)) - signal] - ifFalse: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr - type: #read - accessor: ((self registerStateSettersForSizes: size + 1) at: rt + 1)) - signal. - (ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr + 8 - type: #read - accessor: ((self registerStateSettersForSizes: size + 1) at: rt2 + 1)) - signal]]. - - op0op2 = 0 ifTrue: "LDAXR/STLXR register on page C4-279" - [| result rs | - self assert: size = 3. - opc = 1 ifTrue: - [^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr - type: #read - accessor: (self registerStateSetters at: rt + 1)) signal]. - opc = 0 ifTrue: - [result := (ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr - type: #write - accessor: (self registerStateGetters at: rt + 1)) signal. - rs := instruction >> 16 bitAnd: 31. - "For now assume the write succeeded..." - self perform: ((self registerStateSettersForSizes: 2) at: rs + 1) - with: 0. - ^result]]]. - - ((instruction bitShift: -21) noMask: 1) ifTrue: "op3 = 0xxxxx" - [offsetFromImm := ((instruction bitShift: -12) bitAnd: 16r1FF) bitShift: size. - opc = 0 ifTrue:"C4-286 opc = 0 => store" - [self assert: size = 3. - ^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: (self perform: (self registerStateGetters at: rn + 1)) + offsetFromImm - type: #write - accessor: (self registerStateGetters at: rt + 1)) - signal]. - opc = 1 ifTrue: - [^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: (self perform: (self registerStateGetters at: rn + 1)) + offsetFromImm - type: #read - accessor: ((self registerStateSettersForSizes: size) at: rt + 1)) - signal]. - self halt: 'op3 = 0xxxxx opc > 1']. - - "op0 op2 op3 op4 - xx11 0x 1xxxxx 10 Load/store register (register offset) on page C4-295 (296/297)" - - v := instruction >> 26 bitAnd: 1. - rm := instruction >> 16 bitAnd: 31. - shift := instruction anyMask: 1 << 12. - (size = 3 and: [v = 0]) ifTrue: - [addr := (self perform: (self registerStateGetters at: rn + 1)) - + (shift - ifTrue: [(self perform: (self registerStateGetters at: rm + 1)) << size] - ifFalse: [self perform: (self registerStateGetters at: rm + 1)]). - opc = 0 ifTrue: "STR (register) - 64-bit variant on page C6-1242" - [^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr - type: #write - accessor: (self registerStateGetters at: rt + 1)) - signal]. - opc = 1 ifTrue: "LDR (register) - 64-bit variant on page C6-981" - [^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr - type: #read - accessor: (self registerStateSetters at: rt + 1)) - signal]. - (opc = 3 and: [instruction >> 10 allMask: 63]) ifTrue: "CASAL C4-278/C6-829" - [^(CompareAndSwapSimulationTrap - pc: pc - nextpc: pc + 4 - address: (self perform: (self registerStateGetters at: rn + 1)) - type: #write - accessor: (self registerStateSetters at: rm + 1)) - expectedValue: (self perform: (self registerStateGetters at: rm + 1)); - storedValue: (self perform: (self registerStateGetters at: rt + 1)); - signal]. - self halt: 'op3 = 1xxxxx opc > 1']. - self halt: 'op3 = 1xxxxx size ~= 3'! Item was changed: ----- Method: GdbARMv8Alien>>popWordIn: (in category 'execution') ----- popWordIn: aMemory | sp word | + word := aMemory long64At: (sp := self sp) + 1 - self primitiveMemoryOffset. - word := aMemory long64At: (sp := self sp) + 1. self sp: sp + 8. ^word! Item was added: + ----- Method: GdbARMv8Alien>>primitiveMemoryOffset (in category 'primitives') ----- + primitiveMemoryOffset + "Answer the memory offset. This may be non-zero to adapt to the SpurMemoryManager + simulators discarding the first work of memory to implement a null pointer trap." + <primitive: 'primitiveMemoryOffset' module: 'GdbARMv8Plugin' error: ec> + ^self reportPrimitiveFailure! Item was added: + ----- Method: GdbARMv8Alien>>primitiveSetMemoryOffset: (in category 'primitives') ----- + primitiveSetMemoryOffset: memoryOffset + "Set the memory offset. This may be non-zero to adapt to the SpurMemoryManager + simulators discarding the first work of memory to implement a null pointer trap. + Answer the previous value." + <primitive: 'primitiveMemoryOffset' module: 'GdbARMv8Plugin' error: ec> + ^self reportPrimitiveFailure! Item was changed: ----- Method: GdbARMv8Alien>>pushPair:and:in: (in category 'execution') ----- pushPair: aValue and: bValue in: aMemory | sp | sp := self sp. self assert: (sp noMask: 15). aMemory + unsignedLong64At: sp - 8 + 1 - self primitiveMemoryOffset put: aValue; + unsignedLong64At: sp - 16 + 1 - self primitiveMemoryOffset put: bValue. - unsignedLong64At: sp - 8 + 1 put: aValue; - unsignedLong64At: sp - 16 + 1 put: bValue. ^self sp: sp - 16! Item was changed: ----- Method: GdbARMv8Alien>>pushWord:in: (in category 'execution') ----- pushWord: aValue in: aMemory self assert: (self sp noMask: 15). + aMemory unsignedLong64At: (self sp: self sp - 8) + 1 - self primitiveMemoryOffset put: aValue! - aMemory unsignedLong64At: (self sp: self sp - 8) + 1 put: aValue! Item was changed: ----- Method: GdbARMv8Alien>>retpcIn: (in category 'accessing-abstract') ----- retpcIn: aMemory "The return address is on the stack, having been pushed by either simulateCallOf:nextpc:memory: or simulateJumpCallOf:memory:" + ^aMemory long64At: self fp + 9 - self primitiveMemoryOffset! - ^aMemory long64At: self fp + 9! Item was added: + ----- Method: GdbARMv8Alien64>>handleExecutionPrimitiveFailureIn:minimumAddress:code: (in category 'error handling') ----- + handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" code: errorCode "<Integer>" + "Handle an execution primitive failure. Convert out-of-range call and absolute + memory read into register instructions into ProcessorSimulationTrap signals." + "self disassembleInstructionAt: self pc In: memoryArray" + | instr pc op | + pc := self pc. + instr := self instr. + "(pc between: minimumAddress and: memoryArray byteSize - 1) ifTrue: + [self assert: instr = (memoryArray unsignedLongAt: pc + 1 - self primitiveGetMemoryOffset)]." + op := instr >> 25 bitAnd: 16rF. + (Level0FailureTable at: op + 1) ifNotNil: + [:tuple| + ^self perform: (tuple at: 2) with: instr with: pc]. + ^self reportPrimitiveFailure! Item was changed: ----- Method: MIPSSimulator>>popWordIn: (in category 'processor api') ----- popWordIn: aMemory | sp word | + word := aMemory unsignedLongAt: (sp := self sp) + 1 - self memoryOffset. - word := aMemory unsignedLongAt: (sp := self sp) + 1 bigEndian: false. self sp: sp + 4. ^word! Item was changed: ----- Method: MIPSSimulator>>pushWord:in: (in category 'processor api') ----- pushWord: aValue in: aMemory + aMemory longAt: (self sp: self sp - 4) + 1 - self memoryOffset put: aValue bigEndian: false! - aMemory longAt: (self sp: self sp - 4) + 1 put: aValue bigEndian: false!

1 0

VM Maker: Cog-eem.447.mcz
by commits＠source.squeak.org 21 Nov '21

21 Nov '21

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.447.mcz ==================== Summary ==================== Name: Cog-eem.447 Author: eem Time: 20 November 2021, 10:15:05.906973 pm UUID: 5670a6c1-87d5-43b5-8087-5b0826d5cfcb Ancestors: Cog-eem.446 ProcessorSimulatorPlugin: Remember to apply the memory offset to disassembly. Fix a slip in primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: from Cog-eem.446 =============== Diff against Cog-eem.446 =============== Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveDisassembleAt:InMemory: (in category 'primitives') ----- "cpuAlien <CogProcessorAlien>" primitiveDisassembleAt: address "<Integer>" InMemory: memory "<Bitmap|ByteArray|WordArray|DoubleWordArray>" "Return an Array of the instruction length and its decompilation as a string for the instruction at address in memory." | cpuAlien cpu instrLenOrErr resultObj log logLen logObj | <var: #cpu type: #'void *'> <var: #log type: #'char *'> <var: #logLen type: #long> cpuAlien := self primitive: #primitiveDisassembleAtInMemory parameters: #(SmallInteger WordsOrBytes) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + address < memoryOffset ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. instrLenOrErr := self disassembleFor: cpu At: address + In: memory - memoryOffset + Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) + memoryOffset. - In: memory - Size: (interpreterProxy byteSizeOf: memory cPtrAsOop). instrLenOrErr < 0 ifTrue: [^interpreterProxy primitiveFailForOSError: instrLenOrErr negated]. log := self getlog: (self addressOf: logLen put: [:v| logLen := v]). resultObj := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 2. resultObj ifNil: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. "Easier keeping the damn thing on the stack than using pushRemappableOop:/popRemappableOop. Where is topRemappableOop when you need it?" interpreterProxy pushRemappableOop: resultObj. logObj := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: logLen. resultObj := interpreterProxy popRemappableOop. logObj ifNil: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. self mem: (interpreterProxy firstIndexableField: logObj) cp: log y: logLen. interpreterProxy storeInteger: 0 ofObject: resultObj withValue: instrLenOrErr; storePointer: 1 ofObject: resultObj withValue: logObj. ^resultObj! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives-legacy') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses." <legacy> | cpuAlien cpu memorySize maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite parameters: #(WordsOrBytes SmallInteger SmallInteger SmallInteger) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. (minAddress < memoryOffset or: [maxAddress < memoryOffset or: [minWriteMaxExecAddress < memoryOffset]]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. maybeErr := self singleStepCPU: cpu + In: memory - memoryOffset - In: memory - memory offset Size: (memorySize + memoryOffset min: maxAddress) MinAddressRead: minAddress Write: minWriteMaxExecAddress. maybeErr ~= 0 ifTrue: [^interpreterProxy primitiveFailForOSError: maybeErr]. ^cpuAlien!

1 0

VM Maker: Cog-eem.446.mcz
by commits＠source.squeak.org 20 Nov '21

20 Nov '21

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.446.mcz ==================== Summary ==================== Name: Cog-eem.446 Author: eem Time: 19 November 2021, 6:30:28.466804 pm UUID: 4c92e983-68fe-49a9-9f05-bfc74d3b1a79 Ancestors: Cog-eem.445 Add a memoryOffset variable to the ProcessorSimulatorPlugin(s). Hence the SpurMemoryManager/ObjectMemory simulators are free to discard the first work in their memory array to implement a null pointer trap. Correct an infelicity in the simulation of the ProcessorSimulatorPlugin(s) by passing the size of the argument, not the size of the simulator's memory, through to the real plugin, i.e. refactor rawPrimitive[Run|SingleStep]InMemory:offsetBy:minimumAddress:readOnlyBelow: to rawPrimitive[Run|SingleStep]InMemory:size:offsetBy:minimumAddress:readOnlyBelow: =============== Diff against Cog-eem.444 =============== Item was removed: - ----- Method: BochsIA32Alien>>rawPrimitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- - rawPrimitiveRunInMemory: memoryArray offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress - "A version of primitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" - <primitive: 'primitiveRunInMemoryOffsetMinimumAddressReadWrite' module: 'BochsIA32Plugin' error: ec> - ^ec! Item was added: + ----- Method: BochsIA32Alien>>rawPrimitiveRunInMemory:size:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- + rawPrimitiveRunInMemory: memoryArray size: size offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress + "A version of primitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" + <primitive: 'primitiveRunInMemorySizeOffsetMinimumAddressReadWrite' module: 'BochsIA32Plugin' error: ec> + ^ec! Item was removed: - ----- Method: BochsIA32Alien>>rawPrimitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- - rawPrimitiveSingleStepInMemory: memoryArray offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress - "A version of primitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" - <primitive: 'primitiveSingleStepInMemoryOffsetMinimumAddressReadWrite' module: 'BochsIA32Plugin' error: ec> - ^ec! Item was added: + ----- Method: BochsIA32Alien>>rawPrimitiveSingleStepInMemory:size:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- + rawPrimitiveSingleStepInMemory: memoryArray size: size offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress + "A version of primitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" + <primitive: 'primitiveSingleStepInMemorySizeOffsetMinimumAddressReadWrite' module: 'BochsIA32Plugin' error: ec> + ^ec! Item was added: + ----- Method: BochsIA32Alien>>registerStateFPIndex (in category 'accessing-abstract') ----- + registerStateFPIndex + "Answer the index of the FP register in the Array answered by integerRegisterState" + ^6! Item was added: + ----- Method: BochsIA32Alien>>registerStateSPIndex (in category 'accessing-abstract') ----- + registerStateSPIndex + "Answer the index of the SP register in the Array answered by integerRegisterState" + ^5! Item was removed: - ----- Method: BochsX64Alien>>rawPrimitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- - rawPrimitiveRunInMemory: memoryArray offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress - "A version of primitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" - <primitive: 'primitiveRunInMemoryOffsetMinimumAddressReadWrite' module: 'BochsX64Plugin' error: ec> - ^ec! Item was added: + ----- Method: BochsX64Alien>>rawPrimitiveRunInMemory:size:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- + rawPrimitiveRunInMemory: memoryArray size: size offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress + "A version of primitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" + <primitive: 'primitiveRunInMemorySizeOffsetMinimumAddressReadWrite' module: 'BochsX64Plugin' error: ec> + ^ec! Item was removed: - ----- Method: BochsX64Alien>>rawPrimitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- - rawPrimitiveSingleStepInMemory: memoryArray offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress - "A version of primitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" - <primitive: 'primitiveSingleStepInMemoryOffsetMinimumAddressReadWrite' module: 'BochsX64Plugin' error: ec> - ^ec! Item was added: + ----- Method: BochsX64Alien>>rawPrimitiveSingleStepInMemory:size:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- + rawPrimitiveSingleStepInMemory: memoryArray size: size offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress + "A version of primitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" + <primitive: 'primitiveSingleStepInMemorySizeOffsetMinimumAddressReadWrite' module: 'BochsX64Plugin' error: ec> + ^ec! Item was added: + ----- Method: BochsX64Alien>>registerStateFPIndex (in category 'accessing-abstract') ----- + registerStateFPIndex + "Answer the index of the FP register in the Array answered by integerRegisterState" + ^6! Item was added: + ----- Method: BochsX64Alien>>registerStateSPIndex (in category 'accessing-abstract') ----- + registerStateSPIndex + "Answer the index of the SP register in the Array answered by integerRegisterState" + ^5! Item was added: + ----- Method: CogProcessorAlien>>registerStateFPIndex (in category 'accessing-abstract') ----- + registerStateFPIndex + "Answer the index of the FP register in the Array answered by integerRegisterState" + ^self subclassResponsibility! Item was added: + ----- Method: CogProcessorAlien>>registerStateSPIndex (in category 'accessing-abstract') ----- + registerStateSPIndex + "Answer the index of the SP register in the Array answered by integerRegisterState" + ^self subclassResponsibility! Item was removed: - ----- Method: GdbARMAlien>>rawPrimitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- - rawPrimitiveRunInMemory: memoryArray offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress - "A version of primitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" - <primitive: 'primitiveRunInMemoryOffsetMinimumAddressReadWrite' module: 'GdbARMPlugin' error: ec> - ^ec! Item was added: + ----- Method: GdbARMAlien>>rawPrimitiveRunInMemory:size:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- + rawPrimitiveRunInMemory: memoryArray size: size offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress + "A version of primitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" + <primitive: 'primitiveRunInMemorySizeOffsetMinimumAddressReadWrite' module: 'GdbARMPlugin' error: ec> + ^ec! Item was removed: - ----- Method: GdbARMAlien>>rawPrimitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- - rawPrimitiveSingleStepInMemory: memoryArray offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress - "A version of primitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" - <primitive: 'primitiveSingleStepInMemoryOffsetMinimumAddressReadWrite' module: 'GdbARMPlugin' error: ec> - ^ec! Item was added: + ----- Method: GdbARMAlien>>rawPrimitiveSingleStepInMemory:size:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- + rawPrimitiveSingleStepInMemory: memoryArray size: size offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress + "A version of primitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" + <primitive: 'primitiveSingleStepInMemorySizeOffsetMinimumAddressReadWrite' module: 'GdbARMPlugin' error: ec> + ^ec! Item was added: + ----- Method: GdbARMAlien>>registerStateFPIndex (in category 'accessing-abstract') ----- + registerStateFPIndex + "Answer the index of the FP register in the Array answered by integerRegisterState" + ^12! Item was added: + ----- Method: GdbARMAlien>>registerStateSPIndex (in category 'accessing-abstract') ----- + registerStateSPIndex + "Answer the index of the SP register in the Array answered by integerRegisterState" + ^14! Item was removed: - ----- Method: GdbARMv8Alien>>rawPrimitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- - rawPrimitiveRunInMemory: memoryArray offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress - "A version of primitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" - <primitive: 'primitiveRunInMemoryOffsetMinimumAddressReadWrite' module: 'GdbARMv8Plugin' error: ec> - ^ec! Item was added: + ----- Method: GdbARMv8Alien>>rawPrimitiveRunInMemory:size:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- + rawPrimitiveRunInMemory: memoryArray size: size offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress + "A version of primitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" + <primitive: 'primitiveRunInMemorySizeOffsetMinimumAddressReadWrite' module: 'GdbARMv8Plugin' error: ec> + ^ec! Item was removed: - ----- Method: GdbARMv8Alien>>rawPrimitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- - rawPrimitiveSingleStepInMemory: memoryArray offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress - "A version of primitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" - <primitive: 'primitiveSingleStepInMemoryOffsetMinimumAddressReadWrite' module: 'GdbARMv8Plugin' error: ec> - ^ec! Item was added: + ----- Method: GdbARMv8Alien>>rawPrimitiveSingleStepInMemory:size:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives-simulation') ----- + rawPrimitiveSingleStepInMemory: memoryArray size: size offsetBy: offset minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress + "A version of primitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: for simulation" + <primitive: 'primitiveSingleStepInMemorySizeOffsetMinimumAddressReadWrite' module: 'GdbARMv8Plugin' error: ec> + ^ec! Item was added: + ----- Method: GdbARMv8Alien>>registerStateFPIndex (in category 'accessing-abstract') ----- + registerStateFPIndex + "Answer the index of the FP register in the Array answered by integerRegisterState" + ^30! Item was added: + ----- Method: GdbARMv8Alien>>registerStateSPIndex (in category 'accessing-abstract') ----- + registerStateSPIndex + "Answer the index of the SP register in the Array answered by integerRegisterState" + ^32! Item was changed: SmartSyntaxInterpreterPlugin subclass: #ProcessorSimulatorPlugin + instanceVariableNames: 'prevInterruptCheckChain memoryOffset mySimulatorAlien' - instanceVariableNames: 'prevInterruptCheckChain mySimulatorAlien' classVariableNames: 'NumIntegerRegisterStateFields' poolDictionaries: 'VMBasicConstants' category: 'Cog-ProcessorPlugins'! !ProcessorSimulatorPlugin commentStamp: 'eem 11/19/2019 09:32' prior: 0! ProcessorSimulatorPlugin is the abstract superclass for plugins that interface to a processor simulator that executes the machine code for some processor the Cog JIT generates code for. These include the Bochs C++ IA32/x64 processor emulator, and the GDB simulator for the ARMv6 and ARMv8 architectures. Instance Variables prevInterruptCheckChain: <Symbol/function pointer> prevInterruptCheckChain - the previous value of the interruptCheckChain function pointer ! Item was changed: ----- Method: ProcessorSimulatorPlugin class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator self ~~ ProcessorSimulatorPlugin ifTrue: [super declareCVarsIn: aCCodeGenerator. aCCodeGenerator + var: 'memoryOffset' declareC: 'static sqInt memoryOffset = 0'; removeVariable: 'prevInterruptCheckChain'; "lives in the platform support code." removeConstant: #NumIntegerRegisterStateFields]. "defined by the header file" aCCodeGenerator removeVariable: 'mySimulatorAlien' ifAbsent: nil! Item was added: + ----- Method: ProcessorSimulatorPlugin>>primitiveMemoryOffset (in category 'primitives') ----- + primitiveMemoryOffset + "Get or set the memory offset. If non-zero the memry offset is one word (4 or 8 bytes), to marry with the + SuprMemoryManager simulators discarding of the first word of memory as a null pointer trap." + <export: true flags: #(FastCPrimitiveFlag)> + | offset previousValue | + interpreterProxy methodArgumentCount = 0 ifTrue: + [^interpreterProxy methodReturnInteger: memoryOffset]. + interpreterProxy methodArgumentCount ~= 1 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadNumArgs]. + offset := interpreterProxy stackValue: 0. + (interpreterProxy isIntegerObject: offset) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + previousValue := memoryOffset. + memoryOffset := interpreterProxy integerValueOf: offset. + ^interpreterProxy methodReturnInteger: previousValue! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveRunInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives-legacy') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." <legacy> | cpuAlien cpu memorySize maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveRunInMemoryMinAddressMaxAddressReadWrite parameters: #(WordsOrBytes SmallInteger SmallInteger SmallInteger) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + (minAddress < memoryOffset + or: [maxAddress < memoryOffset + or: [minWriteMaxExecAddress < memoryOffset]]) ifTrue: - (minAddress < 0 - or: [maxAddress < 0 - or: [minWriteMaxExecAddress < 0]]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. "Add forceStopOnInterrupt to the interrupt check chain. It is our responsibility to chain calls, hence we remember any previous client in prevInterruptCheckChain." prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt. prevInterruptCheckChain = #forceStopOnInterrupt ifTrue: [prevInterruptCheckChain := 0]. memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. maybeErr := self runCPU: cpu + In: memory - memoryOffset + Size: (memorySize + memoryOffset min: maxAddress) - In: memory - Size: (memorySize min: maxAddress) MinAddressRead: minAddress Write: minWriteMaxExecAddress. interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. maybeErr ~= 0 ifTrue: [^interpreterProxy primitiveFailForOSError: maybeErr]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveRunInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." | cpuAlien cpu maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveRunInMemoryMinimumAddressReadWrite parameters: #(WordsOrBytes SmallInteger SmallInteger) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + (minAddress < memoryOffset + or: [minWriteMaxExecAddress < memoryOffset]) ifTrue: - (minAddress < 0 - or: [minWriteMaxExecAddress < 0]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt. prevInterruptCheckChain = #forceStopOnInterrupt ifTrue: [prevInterruptCheckChain := 0]. maybeErr := self runCPU: cpu + In: memory - memoryOffset + Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) + memoryOffset - In: memory - Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) MinAddressRead: minAddress Write: minWriteMaxExecAddress. interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. maybeErr ~= 0 ifTrue: [^interpreterProxy primitiveFailForOSError: maybeErr]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveRunInMemory:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives') ----- "cpuAlien <ProcessorSimulatorAlien>" primitiveRunInMemory: memory "<BitsObject>" offsetBy: offset "<Integer>" minimumAddress: minAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." | cpuAlien cpu maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveRunInMemoryOffsetMinimumAddressReadWrite parameters: #(WordsOrBytes SmallInteger SmallInteger SmallInteger) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + (minAddress < memoryOffset + or: [minWriteMaxExecAddress < memoryOffset]) ifTrue: - (minAddress < 0 - or: [minWriteMaxExecAddress < 0]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt. prevInterruptCheckChain = #forceStopOnInterrupt ifTrue: [prevInterruptCheckChain := 0]. maybeErr := self runCPU: cpu + In: (self cCoerceSimple: memory to: #'char *') - memoryOffset + offset + Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) + memoryOffset - offset - In: (self cCoerceSimple: memory to: #'char *') + offset - Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) MinAddressRead: minAddress Write: minWriteMaxExecAddress. interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. maybeErr ~= 0 ifTrue: [^interpreterProxy primitiveFailForOSError: maybeErr]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives-legacy') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses." <legacy> | cpuAlien cpu memorySize maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite parameters: #(WordsOrBytes SmallInteger SmallInteger SmallInteger) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + (minAddress < memoryOffset + or: [maxAddress < memoryOffset + or: [minWriteMaxExecAddress < memoryOffset]]) ifTrue: - (minAddress < 0 - or: [maxAddress < 0 - or: [minWriteMaxExecAddress < 0]]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. maybeErr := self singleStepCPU: cpu + In: memory - memory offset + Size: (memorySize + memoryOffset min: maxAddress) - In: memory - Size: (memorySize min: maxAddress) MinAddressRead: minAddress Write: minWriteMaxExecAddress. maybeErr ~= 0 ifTrue: [^interpreterProxy primitiveFailForOSError: maybeErr]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveSingleStepInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses." | cpuAlien cpu maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveSingleStepInMemoryMinimumAddressReadWrite parameters: #(WordsOrBytes SmallInteger SmallInteger) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + (minAddress < memoryOffset + or: [minWriteMaxExecAddress < memoryOffset]) ifTrue: - (minAddress < 0 - or: [minWriteMaxExecAddress < 0]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. maybeErr := self singleStepCPU: cpu + In: memory - memoryOffset + Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) + memoryOffset - In: memory - Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) MinAddressRead: minAddress Write: minWriteMaxExecAddress. maybeErr ~= 0 ifTrue: [^interpreterProxy primitiveFailForOSError: maybeErr]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveSingleStepInMemory:offsetBy:minimumAddress:readOnlyBelow: (in category 'primitives') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" offsetBy: offset "<Integer>" minimumAddress: minAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses." | cpuAlien cpu maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveSingleStepInMemoryOffsetMinimumAddressReadWrite parameters: #(WordsOrBytes SmallInteger SmallInteger SmallInteger) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + (minAddress < memoryOffset + or: [minWriteMaxExecAddress < memoryOffset]) ifTrue: - (minAddress < 0 - or: [minWriteMaxExecAddress < 0]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. maybeErr := self singleStepCPU: cpu + In: (self cCoerceSimple: memory to: #'char *') - memoryOffset + offset + Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) - offset + memoryOffset - In: (self cCoerceSimple: memory to: #'char *') + offset - Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) MinAddressRead: minAddress Write: minWriteMaxExecAddress. maybeErr ~= 0 ifTrue: [^interpreterProxy primitiveFailForOSError: maybeErr]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulatorPlugin>>runCPU:In:Size:MinAddressRead:Write: (in category 'simulation') ----- runCPU: cpu In: memoryCArray Size: memorySize MinAddressRead: minAddress Write: minWriteMaxExecAddress <doNotGenerate> "*now* we need derived pointers. Ho hum... But all we need is one more level of indirection..." | result | result := mySimulatorAlien rawPrimitiveRunInMemory: interpreterProxy memory + size: memorySize offsetBy: memoryCArray ptrAddress minimumAddress: minAddress readOnlyBelow: minWriteMaxExecAddress. ^result == mySimulatorAlien ifTrue: [0] ifFalse: [result isPrimitiveError ifTrue: [result errorCode] ifFalse: [result]]! Item was changed: ----- Method: ProcessorSimulatorPlugin>>singleStepCPU:In:Size:MinAddressRead:Write: (in category 'simulation') ----- singleStepCPU: cpu In: memoryCArray Size: memorySize MinAddressRead: minAddress Write: minWriteMaxExecAddress <doNotGenerate> "*now* we need derived pointers. Ho hum... But all we need is one more level of indirection..." | result | result := mySimulatorAlien rawPrimitiveSingleStepInMemory: interpreterProxy memory + size: memorySize offsetBy: memoryCArray ptrAddress minimumAddress: minAddress readOnlyBelow: minWriteMaxExecAddress. ^result == mySimulatorAlien ifTrue: [0] ifFalse: [result isPrimitiveError ifTrue: [result errorCode] ifFalse: [result]]!

1 0

[OpenSmalltalk/opensmalltalk-vm] ae7bf9: CogVM source as per VMMaker.oscog-eem.3102
by Eliot Miranda 20 Nov '21

20 Nov '21

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: ae7bf96815718de4cda3152fc79d2a7102707637 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ae7bf96815718de4cd… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2021-11-19 (Fri, 19 Nov 2021) Changed paths: M platforms/Cross/vm/sqSCCSVersion.h M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur32.stack.lowcode/gcc3x-interp.c M src/spur32.stack.lowcode/interp.c M src/spur32.stack/gcc3x-interp.c M src/spur32.stack/interp.c M src/spur32.stack/validImage.c M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/spur64.stack.lowcode/gcc3x-interp.c M src/spur64.stack.lowcode/interp.c M src/spur64.stack/gcc3x-interp.c M src/spur64.stack/interp.c M src/spur64.stack/validImage.c M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c M src/v3.stack/gcc3x-interp.c M src/v3.stack/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3102 CoInterpreter: fix a slip in printStringDataOf:on:. SpurMemoryManager: move changeClassOf:to: up and use bytesPerOop to eliminate duplication of the whole method. sqSCCSVersion.h: eliminate a warning

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2021