Hi,
I ran the clang static analyzer and it found a few potential issues.
For example in primitiveScanCharacters :
[image: Images intégrées 1]
we (tpr) did not protect the result of:
stops := self stackObjectValue: 1.
with a:
self successful ifFalse: [^ nil].
since stackObjectValue: will return nil (null) if the object is immediate:
stackObjectValue: offset
"Ensures that the given object is a real object, not a SmallInteger."
"In the StackInterpreter stacks grow down."
| oop |
oop := stackPages longAt: stackPointer + (offset * objectMemory
wordSize).
(objectMemory isImmediate: oop) ifTrue:
[self primitiveFail. ^ nil].
^oop
then if we don't return now but insist on testing object class, we are
dereferencing null pointer...
Of course, this is theoretical, because it's necessary to put a
SmallInteger in stops, which will make the image pretty unusable whether
the VM crashes or not, but we should generally care to avoid spurious
crashes...
I propose a minor rewrite for this one attached...
It would be a good idea to verify if there are more holes...
Nicolas
2
1
Tim Felgentreff uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker-tfel.360.mcz
==================== Summary ====================
Name: VMMaker-tfel.360
Author: tfel
Time: 30 March 2015, 4:15:59.572 pm
UUID: 490a4aa1-e8dd-d541-85dc-4d1bde376a8c
Ancestors: VMMaker-dtl.359, VMMaker-tfel.359
Merge simulation fixes and optimizations for Balloon and BitBlt. Relevant changes only the simulation classes, the generated code should be unaffected.
=============== Diff against VMMaker-dtl.359 ===============
Item was added:
+ ----- Method: BalloonEngine>>simulateBalloonPrimitive:args: (in category '*VMMaker-InterpreterSimulation') -----
+ simulateBalloonPrimitive: aString args: args
+ ^ Smalltalk at: #BalloonEngineSimulation ifPresent: [:be |
+ be simulatePrimitive: aString receiver: self args: args]!
Item was added:
+ ----- Method: BalloonEngineSimulation class>>simulatePrimitive:receiver:args: (in category 'simulation') -----
+ simulatePrimitive: aString receiver: rcvr args: args
+
+ | proxy bb |
+ proxy := InterpreterProxy new.
+ proxy synthesizeStackFor: rcvr with: args.
+ bb := self simulatorClass new.
+ bb setInterpreter: proxy.
+ bb initialiseModule.
+ "rendering state is loaded in the primitive implementations"
+ [bb perform: aString asSymbol] on: Exception do: [:ex |
+ proxy success: false].
+ ^ proxy stackValue: 0
+ !
Item was changed:
----- Method: BitBltSimulation>>loadColorMap (in category 'interpreter interface') -----
loadColorMap
"ColorMap, if not nil, must be longWords, and
2^N long, where N = sourceDepth for 1, 2, 4, 8 bits,
or N = 9, 12, or 15 (3, 4, 5 bits per color) for 16 or 32 bits."
| cmSize oldStyle oop cmOop |
<inline: true>
cmFlags := cmMask := cmBitsPerColor := 0.
cmShiftTable := nil.
cmMaskTable := nil.
cmLookupTable := nil.
cmOop := interpreterProxy fetchPointer: BBColorMapIndex ofObject: bitBltOop.
cmOop = interpreterProxy nilObject ifTrue:[^true].
cmFlags := ColorMapPresent. "even if identity or somesuch - may be cleared later"
oldStyle := false.
(interpreterProxy isWords: cmOop) ifTrue:[
"This is an old-style color map (indexed only, with implicit RGBA conversion)"
cmSize := interpreterProxy slotSizeOf: cmOop.
cmLookupTable := interpreterProxy firstIndexableField: cmOop.
oldStyle := true.
- self cCode: '' inSmalltalk:
- [self assert: cmLookupTable unitSize = 4].
] ifFalse: [
"A new-style color map (fully qualified)"
((interpreterProxy isPointers: cmOop)
and:[(interpreterProxy slotSizeOf: cmOop) >= 3]) ifFalse:[^false].
cmShiftTable := self loadColorMapShiftOrMaskFrom:
(interpreterProxy fetchPointer: 0 ofObject: cmOop).
cmMaskTable := self loadColorMapShiftOrMaskFrom:
(interpreterProxy fetchPointer: 1 ofObject: cmOop).
oop := interpreterProxy fetchPointer: 2 ofObject: cmOop.
oop = interpreterProxy nilObject
ifTrue:[cmSize := 0]
ifFalse:[(interpreterProxy isWords: oop) ifFalse:[^false].
cmSize := (interpreterProxy slotSizeOf: oop).
cmLookupTable := interpreterProxy firstIndexableField: oop].
cmFlags := cmFlags bitOr: ColorMapNewStyle.
self cCode: '' inSmalltalk:
[self assert: cmShiftTable unitSize = 4.
self assert: cmMaskTable unitSize = 4.
self assert: cmLookupTable unitSize = 4].
].
(cmSize bitAnd: cmSize - 1) = 0 ifFalse:[^false].
cmMask := cmSize - 1.
cmBitsPerColor := 0.
cmSize = 512 ifTrue: [cmBitsPerColor := 3].
cmSize = 4096 ifTrue: [cmBitsPerColor := 4].
cmSize = 32768 ifTrue: [cmBitsPerColor := 5].
cmSize = 0
ifTrue:[cmLookupTable := nil. cmMask := 0]
ifFalse:[cmFlags := cmFlags bitOr: ColorMapIndexedPart].
oldStyle "needs implicit conversion"
ifTrue:[ self setupColorMasks].
"Check if colorMap is just identity mapping for RGBA parts"
(self isIdentityMap: cmShiftTable with: cmMaskTable)
ifTrue:[ cmMaskTable := nil. cmShiftTable := nil ]
ifFalse:[ cmFlags := cmFlags bitOr: ColorMapFixedPart].
^true!
Item was changed:
BitBltSimulation subclass: #BitBltSimulator
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'VMMaker-InterpreterSimulation'!
+ BitBltSimulator class
+ instanceVariableNames: 'opTable maskTable warpBitShiftTable ditherMatrix4x4 ditherThresholds16 ditherValues16 dither8Lookup isInitialised'!
!BitBltSimulator commentStamp: 'tpr 5/5/2003 12:22' prior: 0!
Provide bitblt support for the vm simulator!
+ BitBltSimulator class
+ instanceVariableNames: 'opTable maskTable warpBitShiftTable ditherMatrix4x4 ditherThresholds16 ditherValues16 dither8Lookup isInitialised'!
Item was added:
+ ----- Method: BitBltSimulator class>>dither8Lookup (in category 'accessing') -----
+ dither8Lookup
+
+ ^ dither8Lookup!
Item was added:
+ ----- Method: BitBltSimulator class>>ditherMatrix4x4 (in category 'accessing') -----
+ ditherMatrix4x4
+
+ ^ ditherMatrix4x4!
Item was added:
+ ----- Method: BitBltSimulator class>>ditherThresholds16 (in category 'accessing') -----
+ ditherThresholds16
+
+ ^ ditherThresholds16!
Item was added:
+ ----- Method: BitBltSimulator class>>ditherValues16 (in category 'accessing') -----
+ ditherValues16
+
+ ^ ditherValues16!
Item was added:
+ ----- Method: BitBltSimulator class>>initialize (in category 'class initialization') -----
+ initialize
+ "self initialize"
+ super initialize.
+ isInitialised := false.
+ !
Item was added:
+ ----- Method: BitBltSimulator class>>isInitialised (in category 'accessing') -----
+ isInitialised
+
+ ^ isInitialised!
Item was added:
+ ----- Method: BitBltSimulator class>>maskTable (in category 'accessing') -----
+ maskTable
+
+ ^ maskTable!
Item was added:
+ ----- Method: BitBltSimulator class>>setInitialised (in category 'accessing') -----
+ setInitialised
+
+ isInitialised := true.!
Item was added:
+ ----- Method: BitBltSimulator class>>warpBitShiftTable (in category 'accessing') -----
+ warpBitShiftTable
+
+ ^ warpBitShiftTable!
Item was added:
+ ----- Method: BitBltSimulator>>halftoneAt: (in category 'simulation') -----
+ halftoneAt: idx
+
+ ^ (halftoneBase + (idx \\ halftoneHeight * 4)) long32At: 0!
Item was added:
+ ----- Method: BitBltSimulator>>initialiseModule (in category 'initialize-release') -----
+ initialiseModule
+
+ self class isInitialised ifFalse: [| ivars |
+ ivars := #(opTable maskTable warpBitShiftTable ditherMatrix4x4 ditherThresholds16 ditherValues16 dither8Lookup).
+ super initialiseModule.
+ ivars do: [:symbol | self class instVarNamed: symbol put: (self instVarNamed: symbol)].
+ self class setInitialised].
+ opTable := self class opTable.
+ maskTable := self class maskTable.
+ warpBitShiftTable := self class warpBitShiftTable.
+ ditherMatrix4x4 := self class ditherMatrix4x4.
+ ditherThresholds16 := self class ditherThresholds16.
+ ditherValues16 := self class ditherValues16.
+ dither8Lookup := self class dither8Lookup.
+ !
Item was changed:
----- Method: BitBltSimulator>>initializeDitherTables (in category 'simulation') -----
initializeDitherTables
ditherMatrix4x4 := CArrayAccessor on:
#( 0 8 2 10
12 4 14 6
3 11 1 9
15 7 13 5).
ditherThresholds16 := CArrayAccessor on:#(0 2 4 6 8 10 12 14 16).
ditherValues16 := CArrayAccessor on:
#(0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30).
+ dither8Lookup := CArrayAccessor on: (Array new: 4096).!
- dither8Lookup := CArrayAccessor on: (Array new: 4096).
- self initDither8Lookup.!
Item was added:
+ ----- Method: InterpreterProxy>>synthesizeStackFor:with: (in category 'initialize') -----
+ synthesizeStackFor: receiver with: args
+ <doNotGenerate>
+ self push: receiver.
+ argumentCount := args size.
+ 1 to: argumentCount do: [:i | self push: (args at: i)].!
1
0
Tim Felgentreff uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker-tfel.359.mcz
==================== Summary ====================
Name: VMMaker-tfel.359
Author: tfel
Time: 11 March 2015, 1:52:30.984 pm
UUID: ddaf459e-9bc7-a445-99ae-1959ecd29f9b
Ancestors: VMMaker-tfel.358
optimize BitBltSimulator to avoid reinitialization on each call to simulatedCopyBits. Makes it roughly 500x faster on RSqueakVM
=============== Diff against VMMaker-tfel.358 ===============
Item was changed:
BitBltSimulation subclass: #BitBltSimulator
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'VMMaker-InterpreterSimulation'!
+ BitBltSimulator class
+ instanceVariableNames: 'opTable maskTable warpBitShiftTable ditherMatrix4x4 ditherThresholds16 ditherValues16 dither8Lookup isInitialised'!
!BitBltSimulator commentStamp: 'tpr 5/5/2003 12:22' prior: 0!
Provide bitblt support for the vm simulator!
+ BitBltSimulator class
+ instanceVariableNames: 'opTable maskTable warpBitShiftTable ditherMatrix4x4 ditherThresholds16 ditherValues16 dither8Lookup isInitialised'!
Item was added:
+ ----- Method: BitBltSimulator class>>dither8Lookup (in category 'accessing') -----
+ dither8Lookup
+
+ ^ dither8Lookup!
Item was added:
+ ----- Method: BitBltSimulator class>>ditherMatrix4x4 (in category 'accessing') -----
+ ditherMatrix4x4
+
+ ^ ditherMatrix4x4!
Item was added:
+ ----- Method: BitBltSimulator class>>ditherThresholds16 (in category 'accessing') -----
+ ditherThresholds16
+
+ ^ ditherThresholds16!
Item was added:
+ ----- Method: BitBltSimulator class>>ditherValues16 (in category 'accessing') -----
+ ditherValues16
+
+ ^ ditherValues16!
Item was added:
+ ----- Method: BitBltSimulator class>>initialize (in category 'class initialization') -----
+ initialize
+ "self initialize"
+ super initialize.
+ isInitialised := false.
+ !
Item was added:
+ ----- Method: BitBltSimulator class>>isInitialised (in category 'accessing') -----
+ isInitialised
+
+ ^ isInitialised!
Item was added:
+ ----- Method: BitBltSimulator class>>maskTable (in category 'accessing') -----
+ maskTable
+
+ ^ maskTable!
Item was added:
+ ----- Method: BitBltSimulator class>>setInitialised (in category 'accessing') -----
+ setInitialised
+
+ isInitialised := true.!
Item was added:
+ ----- Method: BitBltSimulator class>>warpBitShiftTable (in category 'accessing') -----
+ warpBitShiftTable
+
+ ^ warpBitShiftTable!
Item was changed:
----- Method: BitBltSimulator>>halftoneAt: (in category 'simulation') -----
halftoneAt: idx
+ ^ (halftoneBase + (idx \\ halftoneHeight * 4)) long32At: 0!
- ^ halftoneForm at: (idx \\ halftoneHeight * 4) + 1!
Item was added:
+ ----- Method: BitBltSimulator>>initialiseModule (in category 'initialize-release') -----
+ initialiseModule
+
+ self class isInitialised ifFalse: [| ivars |
+ ivars := #(opTable maskTable warpBitShiftTable ditherMatrix4x4 ditherThresholds16 ditherValues16 dither8Lookup).
+ super initialiseModule.
+ ivars do: [:symbol | self class instVarNamed: symbol put: (self instVarNamed: symbol)].
+ self class setInitialised].
+ opTable := self class opTable.
+ maskTable := self class maskTable.
+ warpBitShiftTable := self class warpBitShiftTable.
+ ditherMatrix4x4 := self class ditherMatrix4x4.
+ ditherThresholds16 := self class ditherThresholds16.
+ ditherValues16 := self class ditherValues16.
+ dither8Lookup := self class dither8Lookup.
+ !
Item was changed:
----- Method: BitBltSimulator>>initializeDitherTables (in category 'simulation') -----
initializeDitherTables
ditherMatrix4x4 := CArrayAccessor on:
#( 0 8 2 10
12 4 14 6
3 11 1 9
15 7 13 5).
ditherThresholds16 := CArrayAccessor on:#(0 2 4 6 8 10 12 14 16).
ditherValues16 := CArrayAccessor on:
#(0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30).
+ dither8Lookup := CArrayAccessor on: (Array new: 4096).!
- dither8Lookup := CArrayAccessor on: (Array new: 4096).
- self initDither8Lookup.!
1
0
Tim Felgentreff uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker-tfel.358.mcz
==================== Summary ====================
Name: VMMaker-tfel.358
Author: tfel
Time: 11 February 2015, 1:43:59.319 pm
UUID: b8cdfbbd-911c-2848-8a87-286f070bee95
Ancestors: VMMaker-dtl.357
Fix simulation of full world draw
=============== Diff against VMMaker-dtl.357 ===============
Item was changed:
----- Method: BitBltSimulation>>loadColorMap (in category 'interpreter interface') -----
loadColorMap
"ColorMap, if not nil, must be longWords, and
2^N long, where N = sourceDepth for 1, 2, 4, 8 bits,
or N = 9, 12, or 15 (3, 4, 5 bits per color) for 16 or 32 bits."
| cmSize oldStyle oop cmOop |
<inline: true>
cmFlags := cmMask := cmBitsPerColor := 0.
cmShiftTable := nil.
cmMaskTable := nil.
cmLookupTable := nil.
cmOop := interpreterProxy fetchPointer: BBColorMapIndex ofObject: bitBltOop.
cmOop = interpreterProxy nilObject ifTrue:[^true].
cmFlags := ColorMapPresent. "even if identity or somesuch - may be cleared later"
oldStyle := false.
(interpreterProxy isWords: cmOop) ifTrue:[
"This is an old-style color map (indexed only, with implicit RGBA conversion)"
cmSize := interpreterProxy slotSizeOf: cmOop.
cmLookupTable := interpreterProxy firstIndexableField: cmOop.
oldStyle := true.
- self cCode: '' inSmalltalk:
- [self assert: cmLookupTable unitSize = 4].
] ifFalse: [
"A new-style color map (fully qualified)"
((interpreterProxy isPointers: cmOop)
and:[(interpreterProxy slotSizeOf: cmOop) >= 3]) ifFalse:[^false].
cmShiftTable := self loadColorMapShiftOrMaskFrom:
(interpreterProxy fetchPointer: 0 ofObject: cmOop).
cmMaskTable := self loadColorMapShiftOrMaskFrom:
(interpreterProxy fetchPointer: 1 ofObject: cmOop).
oop := interpreterProxy fetchPointer: 2 ofObject: cmOop.
oop = interpreterProxy nilObject
ifTrue:[cmSize := 0]
ifFalse:[(interpreterProxy isWords: oop) ifFalse:[^false].
cmSize := (interpreterProxy slotSizeOf: oop).
cmLookupTable := interpreterProxy firstIndexableField: oop].
cmFlags := cmFlags bitOr: ColorMapNewStyle.
self cCode: '' inSmalltalk:
[self assert: cmShiftTable unitSize = 4.
self assert: cmMaskTable unitSize = 4.
self assert: cmLookupTable unitSize = 4].
].
(cmSize bitAnd: cmSize - 1) = 0 ifFalse:[^false].
cmMask := cmSize - 1.
cmBitsPerColor := 0.
cmSize = 512 ifTrue: [cmBitsPerColor := 3].
cmSize = 4096 ifTrue: [cmBitsPerColor := 4].
cmSize = 32768 ifTrue: [cmBitsPerColor := 5].
cmSize = 0
ifTrue:[cmLookupTable := nil. cmMask := 0]
ifFalse:[cmFlags := cmFlags bitOr: ColorMapIndexedPart].
oldStyle "needs implicit conversion"
ifTrue:[ self setupColorMasks].
"Check if colorMap is just identity mapping for RGBA parts"
(self isIdentityMap: cmShiftTable with: cmMaskTable)
ifTrue:[ cmMaskTable := nil. cmShiftTable := nil ]
ifFalse:[ cmFlags := cmFlags bitOr: ColorMapFixedPart].
^true!
Item was added:
+ ----- Method: BitBltSimulator>>halftoneAt: (in category 'simulation') -----
+ halftoneAt: idx
+
+ ^ halftoneForm at: (idx \\ halftoneHeight * 4) + 1!
1
0
[CfP] ICOOOLPS Workshop: Implementation Compilation Optimization of Object Oriented Languages Programming and Systems
by Tobias Pape 30 Mar '15
by Tobias Pape 30 Mar '15
30 Mar '15
CALL FOR PAPERS (DEADLINE EXTENSION)
10th Workshop on
Implementation, Compilation, Optimization of
Object-Oriented Languages, Programs and Systems !
(Collocated with Ecoop’15)
Prague, Czech Republic, July 6th, 2015
[The deadline has been extended to April, 13th 2015 ]
The ICOOOLPS workshop series brings together researchers and practitioners working in the field of OO languages implementation and optimization. ICOOOLPS key goal is to identify current and emerging issues relating to the efficient implementation, compilation and optimization of such languages, and outlining future challenges and research directions.
CALL FOR PAPERS
Topics of interest for ICOOOLPS include, but are not limited to:
- implementation of fundamental OO and OO-like features (e.g. inheritance, parametric types, memory management, objects, prototypes),
- runtime systems (e.g. compilers, linkers, virtual machines, garbage collectors),
- optimizations (e.g. static or dynamic analyses, adaptive virtual machines),
- resource constraints (e.g. time for real-time systems, space or low-power for embedded systems) and relevant choices and tradeoffs (e.g. constant time vs. non-constant time mechanisms,
- separate compilation vs. global compilation,
- dynamic loading vs. global linking, dynamic checking vs. proof-carrying code…).
SUBMISSION TYPES
ICOOOLPS is not a mini-conference; it is a workshop designed to facilitate discussion and the exchange of ideas between peers. ICOOOLPS therefore welcomes both position (1—4 pages) and research (max. 10 pages) papers.
Position papers should outline interesting or unconventional ideas, which need not be fully fleshed out.
Research papers are expected to contain more complete ideas, but these need not necessarily be fully complete as with a traditional conference.
Authors will be given the option to publish their papers (short or long) in the ACM Digital Library if they wish.
Submissions must be written in English, formatted according to ACM SIGPLAN Proceedings style. Please submit via the EasyChair submission site https://easychair.org/conferences/?conf=icooolps15.
ICOOOLPS PROGRAM COMMITTEE
Chair: Floréal Morandat (LaBRI/France) - Olivier Zendra (Inria, Loria/France)
Carl Friedrich Bolz (King's College London)
Eric Jul (Alcatel-Lucent Bell Labs)
Tobias Pape (Hasso-Plattner-Institute, Potsdam)
Jean Privat (Université du Québec à Montréal)
Jeremy Singer (University of Glasgow)
Gaël Thomas (Telecom SudParis)
Laurence Tratt (King's College London)
Jan Vitek (Northeastern University)
Mario Wolczko (Oracle Labs)
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1129.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.1129
Author: eem
Time: 29 March 2015, 12:09:02.727 am
UUID: b103538d-b36d-4c70-9600-57ee25a189aa
Ancestors: VMMaker.oscog-eem.1128
Add support for the VarBaseReg scheme to ARM
MoveMbrR & MoveRMbr sicne these are used for
accessing the primTraceLogIndex.
Add hasPCRelativeAddressing and for the ARM,
isAddressRelativeToPC:. We can use this to refer
to the method without generating a map entry.
Mark the remaining relevant feature test methods in
CogAbstractInstruciton as <inline: true>.
=============== Diff against VMMaker.oscog-eem.1128 ===============
Item was changed:
----- Method: CogARMCompiler>>concretizeMoveMbrR (in category 'generate machine code - concretize') -----
concretizeMoveMbrR
"Will get inlined into concretizeAt: switch."
"ldrb destReg, [srcReg, #immediate] or ldrb destReg, [srcReg, ConcreteIPReg]"
<inline: true>
| srcReg offset destReg instrOffset|
offset := operands at: 0.
srcReg := self concreteRegister: (operands at: 1).
destReg := self concreteRegister: (operands at: 2).
self is12BitValue: offset
ifTrue:
[ :u :immediate |
self machineCodeAt: 0 "ldrb destReg, [srcReg, #immediate]"
put: (self ldrb: destReg rn: srcReg plus: u imm: immediate).
^machineCodeSize := 4]
ifFalse:
+ [(self isAddressRelativeToVarBase: offset)
+ ifTrue:
+ [self machineCodeAt: 0 put: (self ldr: ConcreteIPReg rn: ConcreteVarBaseReg plusImm: offset - cogit varBaseAddress).
+ instrOffset := 4]
+ ifFalse:
+ [instrOffset := self at: 0 moveCw: offset intoR: ConcreteIPReg].
+ "ldrb destReg, [srcReg, ConcreteIPReg]"
+ self machineCodeAt: instrOffset put: (self ldrb: destReg rn: srcReg rm: ConcreteIPReg).
+ ^machineCodeSize := instrOffset + 4]!
- [instrOffset := self at: 0 moveCw: offset intoR: ConcreteIPReg.
- "ldrb destReg, [srcReg, ConcreteIPReg]"
- self machineCodeAt: instrOffset put: (self ldrb: destReg rn: srcReg rm: ConcreteIPReg).
- ^machineCodeSize := instrOffset + 4 ]!
Item was changed:
----- Method: CogARMCompiler>>concretizeMoveRMbr (in category 'generate machine code - concretize') -----
concretizeMoveRMbr
"Will get inlined into concretizeAt: switch."
<inline: true>
| srcReg offset baseReg instrOffset|
srcReg := self concreteRegister: (operands at: 0).
offset := operands at: 1.
baseReg := self concreteRegister: (operands at: 2).
self is12BitValue: offset
ifTrue:
[ :u :immediate |
self machineCodeAt: 0 "strb srcReg, [baseReg, #immediate]"
put: (self strb: srcReg rn: baseReg plus: u imm: immediate).
^machineCodeSize := 4]
ifFalse:
+ [(self isAddressRelativeToVarBase: offset)
+ ifTrue:
+ [self machineCodeAt: 0 put: (self ldr: ConcreteIPReg rn: ConcreteVarBaseReg plusImm: offset - cogit varBaseAddress).
+ instrOffset := 4]
+ ifFalse:
+ [instrOffset := self at: 0 moveCw: offset intoR: ConcreteIPReg].
- [instrOffset := self at: 0 moveCw: offset intoR: ConcreteIPReg.
"strb srcReg, [baseReg, ConcreteIPReg]"
self machineCodeAt: instrOffset put: (self strb: srcReg rn: baseReg rm: ConcreteIPReg).
^machineCodeSize := instrOffset + 4 ]!
Item was changed:
----- Method: CogARMCompiler>>hasDoublePrecisionFloatingPointSupport (in category 'testing') -----
hasDoublePrecisionFloatingPointSupport
"might be true, but is for the forseeable future disabled"
+ <inline: true>
^false!
Item was added:
+ ----- Method: CogARMCompiler>>isAddressRelativeToPC: (in category 'testing') -----
+ isAddressRelativeToPC: pcAddress
+ "Support for addressing the method relative to the PC."
+ ^pcAddress notNil
+ and: [pcAddress <= address
+ and: [address - pcAddress < (1 << 12)]]!
Item was changed:
----- Method: CogARMCompiler>>isAddressRelativeToVarBase: (in category 'testing') -----
+ isAddressRelativeToVarBase: varAddress
+ "Support for addressing variables off the dedicated VarBaseReg"
+ ^varAddress notNil
+ and: [varAddress >= cogit varBaseAddress
+ and: [varAddress - cogit varBaseAddress < (1 << 12)]]!
- isAddressRelativeToVarBase: address
- ^address notNil
- and: [address >= cogit varBaseAddress
- and: [address - cogit varBaseAddress < (1 << 12)]]!
Item was changed:
----- Method: CogARMCompiler>>isBigEndian (in category 'testing') -----
isBigEndian
+ <inline: true>
^false!
Item was changed:
----- Method: CogAbstractInstruction>>hasDoublePrecisionFloatingPointSupport (in category 'testing') -----
hasDoublePrecisionFloatingPointSupport
+ <inline: true>
^self subclassResponsibility!
Item was changed:
----- Method: CogAbstractInstruction>>hasLinkRegister (in category 'testing') -----
hasLinkRegister
"Answer if the processor has a link register, i.e. if calls pass
the return pc in a register instead of pushing it on a stack."
+ <inline: true>
^self subclassResponsibility!
Item was removed:
- ----- Method: CogAbstractInstruction>>hasPCDependentInstructions (in category 'testing') -----
- hasPCDependentInstructions
- "Answer whether the concrete machine code contains pc-dependent
- instructions, such as the IA32/x86's short and long relative jumps
- and the EMT64/x86-64's pc-relative addressing mode. Such
- instructions require an extra pass to generate them correctly."
- ^false!
Item was changed:
----- Method: CogAbstractInstruction>>hasPCRegister (in category 'testing') -----
hasPCRegister
"Answer if the processor has a generally addressable pc register, such as the ARM.
On such processors we can execute jumping to pop top of stack by popping into
the pc register. Note that this is not a generic RISC feature. The PowerPC does not
allow one to pop into the pc for example. So by default, answer false."
+ <inline: true>
^false!
Item was added:
+ ----- Method: CogAbstractInstruction>>hasPCRelativeAddressing (in category 'testing') -----
+ hasPCRelativeAddressing
+ "Answer if the processor has PC-relative addressing."
+ <inline: true>
+ ^self subclassResponsibility!
Item was changed:
----- Method: CogAbstractInstruction>>isBigEndian (in category 'testing') -----
isBigEndian
+ <inline: true>
^self subclassResponsibility!
Item was changed:
----- Method: CogIA32Compiler>>hasDoublePrecisionFloatingPointSupport (in category 'testing') -----
hasDoublePrecisionFloatingPointSupport
"We can generate dpfp support if the processor has SSE2 instructions."
+ <inline: true>
^self hasSSE2Instructions!
Item was removed:
- ----- Method: CogIA32Compiler>>hasPCDependentInstructions (in category 'testing') -----
- hasPCDependentInstructions
- "Answer whether the concrete machine code contains pc-dependent
- instructions, such as the IA32/x86's short and long relative jumps
- and the EMT64/x86-64's pc-relative addressing mode. Such
- instructions require an extra pass to generate them correctly."
- ^true!
Item was changed:
----- Method: CogIA32Compiler>>isBigEndian (in category 'testing') -----
isBigEndian
+ <inline: true>
^false!
1
0
[commit][3296] VMMaker-dtl.359 (VMMaker 4.13.12) and related updates to AioPlugin and OSProcessPlugin.
by commitsï¼ squeakvm.org 29 Mar '15
by commitsï¼ squeakvm.org 29 Mar '15
29 Mar '15
Revision: 3296
Author: lewis
Date: 2015-03-28 17:30:44 -0700 (Sat, 28 Mar 2015)
Log Message:
-----------
VMMaker-dtl.359 (VMMaker 4.13.12) and related updates to AioPlugin and OSProcessPlugin.
Implement primitiveIsBigEnder. Platform endianness can be deduced from the image, but some images may find this awkward, so provide the primitive as an assist.
Additional simulation support from oscog.
Code generation updates from oscog (excluding type inferencer because of translation time dependencies).
Various refactoring cleanups.
Fix undeclareds.
Object memory is responsible for #bytesPerWord and #baseHeaderSize, make it so in StackInterpreter.
Modified Paths:
--------------
trunk/src/ckformat.c
trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
trunk/src/plugins/AioPlugin/AioPlugin.c
trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
trunk/src/plugins/B2DPlugin/B2DPlugin.c
trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
trunk/src/plugins/CameraPlugin/CameraPlugin.c
trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
trunk/src/plugins/DBusPlugin/DBusPlugin.c
trunk/src/plugins/DSAPrims/DSAPrims.c
trunk/src/plugins/DropPlugin/DropPlugin.c
trunk/src/plugins/FFTPlugin/FFTPlugin.c
trunk/src/plugins/FT2Plugin/FT2Plugin.c
trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c
trunk/src/plugins/FilePlugin/FilePlugin.c
trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c
trunk/src/plugins/GeniePlugin/GeniePlugin.c
trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c
trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c
trunk/src/plugins/Klatt/Klatt.c
trunk/src/plugins/LargeIntegers/LargeIntegers.c
trunk/src/plugins/LocalePlugin/LocalePlugin.c
trunk/src/plugins/MIDIPlugin/MIDIPlugin.c
trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
trunk/src/plugins/RePlugin/RePlugin.c
trunk/src/plugins/RomePlugin/RomePlugin.c
trunk/src/plugins/ScratchPlugin/ScratchPlugin.c
trunk/src/plugins/SecurityPlugin/SecurityPlugin.c
trunk/src/plugins/SerialPlugin/SerialPlugin.c
trunk/src/plugins/SocketPlugin/SocketPlugin.c
trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c
trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
trunk/src/plugins/SoundPlugin/SoundPlugin.c
trunk/src/plugins/Squeak3D/Squeak3D.c
trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
trunk/src/plugins/SqueakSSL/SqueakSSL.c
trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c
trunk/src/plugins/UUIDPlugin/UUIDPlugin.c
trunk/src/plugins/UnicodePlugin/UnicodePlugin.c
trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
trunk/src/plugins/WeDoPlugin/WeDoPlugin.c
trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c
trunk/src/vm/interp.c
trunk/src/vm/interp.h
trunk/src/vm/sqNamedPrims.h
Modified: trunk/src/ckformat.c
===================================================================
--- trunk/src/ckformat.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/ckformat.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -5,7 +5,7 @@
/* Usage: ckformat imageFileName */
/* --- DO NOT EDIT THIS FILE --- */
-/* --- Automatically generated from class ImageFormat 2014-12-30T18:33:46.158+01:00--- */
+/* --- Automatically generated from class ImageFormat 2015-03-28T20:15:59.567+01:00--- */
/* --- Source code is in package ImageFormat in the VMMaker repository --- */
/* --- DO NOT EDIT THIS FILE --- */
Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
===================================================================
--- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:35 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:48 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- ADPCMCodecPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ ADPCMCodecPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -70,9 +70,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ADPCMCodecPlugin 30 December 2014 (i)"
+ "ADPCMCodecPlugin 28 March 2015 (i)"
#else
- "ADPCMCodecPlugin 30 December 2014 (e)"
+ "ADPCMCodecPlugin 28 March 2015 (e)"
#endif
;
Modified: trunk/src/plugins/AioPlugin/AioPlugin.c
===================================================================
--- trunk/src/plugins/AioPlugin/AioPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/AioPlugin/AioPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:45 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:59 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0
+ UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.18 uuid: c426ab70-05a2-43a1-a899-e324aaf8f92f
*/
-static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 " __DATE__ ;
+static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.18 uuid: c426ab70-05a2-43a1-a899-e324aaf8f92f " __DATE__ ;
@@ -76,7 +76,6 @@
EXPORT(sqInt) shutdownModule(void);
#pragma export off
static int socketDescriptorFrom(sqInt sqSocketOop);
-static sqInt socketRecordSize(void);
static sqInt stringFromCString(const char *aCString);
static char * versionString(void);
/*** Variables ***/
@@ -87,9 +86,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AioPlugin 30 December 2014 (i)"
+ "AioPlugin 28 March 2015 (i)"
#else
- "AioPlugin 30 December 2014 (e)"
+ "AioPlugin 28 March 2015 (e)"
#endif
;
@@ -165,7 +164,7 @@
sqSocketBytes = interpreterProxy->arrayValueOf(objectPointer);
idx = 0;
- while (idx < (socketRecordSize())) {
+ while (idx < (sizeof(SQSocket))) {
if ((sqSocketBytes[idx]) != 0) {
return 0;
}
@@ -362,7 +361,7 @@
sqInt sqSocketOop;
sqSocketOop = interpreterProxy->stackValue(0);
- if (!(((interpreterProxy->isBytes(sqSocketOop)) && ((interpreterProxy->byteSizeOf(sqSocketOop)) == (socketRecordSize()))) && (!(isNullSQSocket(sqSocketOop))))) {
+ if (!(((interpreterProxy->isBytes(sqSocketOop)) && ((interpreterProxy->byteSizeOf(sqSocketOop)) == (sizeof(SQSocket)))) && (!(isNullSQSocket(sqSocketOop))))) {
return interpreterProxy->primitiveFail();
}
fileNo = socketDescriptorFrom(sqSocketOop);
@@ -432,13 +431,6 @@
}
-/* Answer the size of a SQSocket data structure in bytes. */
-
-static sqInt socketRecordSize(void) {
- return sizeof(SQSocket);
-}
-
-
/* Answer a new String copied from a null-terminated C string.
Caution: This may invoke the garbage collector. */
Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:35 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:48 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- AsynchFilePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ AsynchFilePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -67,12 +67,13 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AsynchFilePlugin 30 December 2014 (i)"
+ "AsynchFilePlugin 28 March 2015 (i)"
#else
- "AsynchFilePlugin 30 December 2014 (e)"
+ "AsynchFilePlugin 28 March 2015 (e)"
#endif
;
static void * sCOAFfn;
+static sqInt simulator;
@@ -142,9 +143,9 @@
EXPORT(sqInt) primitiveAsyncFileOpen(void) {
sqInt fOop;
+ sqInt okToOpen;
+ sqInt fileNameSize;
AsyncFile *f;
- sqInt fileNameSize;
- sqInt okToOpen;
char *fileName;
sqInt writeFlag;
sqInt semaIndex;
Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:37 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:50 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- BalloonEnginePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ BalloonEnginePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -447,9 +447,9 @@
static void * loadBBFn;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B2DPlugin 30 December 2014 (i)"
+ "B2DPlugin 28 March 2015 (i)"
#else
- "B2DPlugin 30 December 2014 (e)"
+ "B2DPlugin 28 March 2015 (e)"
#endif
;
static int* objBuffer;
Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
===================================================================
--- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:41 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:54 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- B3DAcceleratorPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ B3DAcceleratorPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -107,9 +107,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B3DAcceleratorPlugin 30 December 2014 (i)"
+ "B3DAcceleratorPlugin 28 March 2015 (i)"
#else
- "B3DAcceleratorPlugin 30 December 2014 (e)"
+ "B3DAcceleratorPlugin 28 March 2015 (e)"
#endif
;
Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
===================================================================
--- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:35 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:48 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- BMPReadWriterPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ BMPReadWriterPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -58,9 +58,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BMPReadWriterPlugin 30 December 2014 (i)"
+ "BMPReadWriterPlugin 28 March 2015 (i)"
#else
- "BMPReadWriterPlugin 30 December 2014 (e)"
+ "BMPReadWriterPlugin 28 March 2015 (e)"
#endif
;
Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:37 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:51 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- BitBltSimulation VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ BitBltSimulation VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -256,9 +256,9 @@
};
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BitBltPlugin 30 December 2014 (i)"
+ "BitBltPlugin 28 March 2015 (i)"
#else
- "BitBltPlugin 30 December 2014 (e)"
+ "BitBltPlugin 28 March 2015 (e)"
#endif
;
static sqInt nWords;
@@ -267,6 +267,7 @@
static void *opTable[43];
static sqInt preload;
static void * querySurfaceFn;
+static sqInt simulator;
static sqInt skew;
static sqInt sourceAlpha;
static sqInt sourceBits;
@@ -3976,10 +3977,10 @@
sqInt g;
sqInt srcColor;
sqInt aG;
- sqInt d;
sqInt a;
sqInt aA;
sqInt aR;
+ sqInt d;
sqInt dstMask;
sqInt srcAlpha;
sqInt r;
@@ -4823,8 +4824,8 @@
static sqInt warpLoop(void) {
sqInt mapperFlags;
sqInt dstShiftLeft;
+ sqInt skewWord;
sqInt words;
- sqInt skewWord;
sqInt nSteps;
sqInt deltaP43y;
sqInt destWord;
Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c
===================================================================
--- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:41 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:54 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- CameraPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ CameraPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "CameraPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "CameraPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -64,9 +64,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "CameraPlugin 30 December 2014 (i)"
+ "CameraPlugin 28 March 2015 (i)"
#else
- "CameraPlugin 30 December 2014 (e)"
+ "CameraPlugin 28 March 2015 (e)"
#endif
;
Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
===================================================================
--- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:41 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:54 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- ClipboardExtendedPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ ClipboardExtendedPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -61,11 +61,12 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ClipboardExtendedPlugin 30 December 2014 (i)"
+ "ClipboardExtendedPlugin 28 March 2015 (i)"
#else
- "ClipboardExtendedPlugin 30 December 2014 (e)"
+ "ClipboardExtendedPlugin 28 March 2015 (e)"
#endif
;
+static sqInt simulator;
Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
===================================================================
--- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:51 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- CroquetPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ CroquetPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -73,9 +73,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "CroquetPlugin 30 December 2014 (i)"
+ "CroquetPlugin 28 March 2015 (i)"
#else
- "CroquetPlugin 30 December 2014 (e)"
+ "CroquetPlugin 28 March 2015 (e)"
#endif
;
Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c
===================================================================
--- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:41 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:55 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665
*/
@@ -143,11 +143,12 @@
static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH];
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DBusPlugin 30 December 2014 (i)"
+ "DBusPlugin 28 March 2015 (i)"
#else
- "DBusPlugin 30 December 2014 (e)"
+ "DBusPlugin 28 March 2015 (e)"
#endif
;
+static sqInt simulator;
static DBusMessage* writeMessage;
static DBusMessageIter writeMessageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH];
@@ -862,8 +863,8 @@
/* returns path to an object argument as a string */
EXPORT(sqInt) primitiveDBusArgumentGetObjectPath(void) {
+ char *str;
int type;
- char *str;
sqInt _return_value;
if (!(hasArgument)) {
@@ -908,8 +909,8 @@
/* returns the readed string argument as oop */
EXPORT(sqInt) primitiveDBusArgumentGetString(void) {
+ char *str;
int type;
- char *str;
sqInt _return_value;
if (!(hasArgument)) {
Modified: trunk/src/plugins/DSAPrims/DSAPrims.c
===================================================================
--- trunk/src/plugins/DSAPrims/DSAPrims.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/DSAPrims/DSAPrims.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:51 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- DSAPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ DSAPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "DSAPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "DSAPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -67,9 +67,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DSAPrims 30 December 2014 (i)"
+ "DSAPrims 28 March 2015 (i)"
#else
- "DSAPrims 30 December 2014 (e)"
+ "DSAPrims 28 March 2015 (e)"
#endif
;
static sqInt remainderDigitCount;
Modified: trunk/src/plugins/DropPlugin/DropPlugin.c
===================================================================
--- trunk/src/plugins/DropPlugin/DropPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/DropPlugin/DropPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:51 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- DropPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ DropPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "DropPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "DropPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -62,9 +62,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DropPlugin 30 December 2014 (i)"
+ "DropPlugin 28 March 2015 (i)"
#else
- "DropPlugin 30 December 2014 (e)"
+ "DropPlugin 28 March 2015 (e)"
#endif
;
Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c
===================================================================
--- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:51 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- FFTPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ FFTPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "FFTPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "FFTPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -68,9 +68,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FFTPlugin 30 December 2014 (i)"
+ "FFTPlugin 28 March 2015 (i)"
#else
- "FFTPlugin 30 December 2014 (e)"
+ "FFTPlugin 28 March 2015 (e)"
#endif
;
static sqInt nu;
Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c
===================================================================
--- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,4 +1,4 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:42 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:55 pm */
/* Automatically generated by
FT2PluginCodeGenerator * FreeType-nice.443 uuid: d8120335-a67f-4a64-94ea-90145046f7dc
from
@@ -121,11 +121,12 @@
static FT_Library library;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FT2Plugin 30 December 2014 (i)"
+ "FT2Plugin 28 March 2015 (i)"
#else
- "FT2Plugin 30 December 2014 (e)"
+ "FT2Plugin 28 March 2015 (e)"
#endif
;
+static sqInt simulator;
@@ -759,11 +760,11 @@
}
EXPORT(sqInt) primitiveGetKerningLeftRight(void) {
+ FT_Face face;
+ sqInt rcvr;
sqInt kernMode;
- sqInt rcvr;
FT_Vector result;
sqInt pointOop;
- FT_Face face;
sqInt leftGlyph;
sqInt rightGlyph;
sqInt _return_value;
@@ -990,8 +991,8 @@
EXPORT(sqInt) primitiveLoadFaceBbox(void) {
sqInt rcvr;
sqInt pointOop;
+ FT_Face face;
sqInt rectOop;
- FT_Face face;
sqInt aRectangle;
sqInt _return_value;
@@ -1144,12 +1145,12 @@
/* Assumes that primitiveLoadGlyph:flags: has been called earlier to set face->glyph. */
EXPORT(sqInt) primitiveLoadGlyphSlotFromFace(void) {
- sqInt rcvr;
+ FT_Glyph_Format *gfPtr;
FT_GlyphSlot gs;
+ FT_Face face;
+ sqInt btw;
sqInt gfOop;
- sqInt btw;
- FT_Face face;
- FT_Glyph_Format *gfPtr;
+ sqInt rcvr;
sqInt aFace;
sqInt _return_value;
Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c
===================================================================
--- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:42 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:55 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- FileCopyPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ FileCopyPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -57,11 +57,12 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FileCopyPlugin 30 December 2014 (i)"
+ "FileCopyPlugin 28 March 2015 (i)"
#else
- "FileCopyPlugin 30 December 2014 (e)"
+ "FileCopyPlugin 28 March 2015 (e)"
#endif
;
+static sqInt simulator;
Modified: trunk/src/plugins/FilePlugin/FilePlugin.c
===================================================================
--- trunk/src/plugins/FilePlugin/FilePlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/FilePlugin/FilePlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.11 translated as C source on 25 March 2015 9:00:19 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:51 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.358 uuid: 6d8d1641-9d58-41f7-99f5-22478bc10ae2
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- FilePlugin VMMaker-dtl.358 uuid: 6d8d1641-9d58-41f7-99f5-22478bc10ae2
+ FilePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "FilePlugin VMMaker-dtl.358 uuid: 6d8d1641-9d58-41f7-99f5-22478bc10ae2 " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -100,9 +100,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FilePlugin 25 March 2015 (i)"
+ "FilePlugin 28 March 2015 (i)"
#else
- "FilePlugin 25 March 2015 (e)"
+ "FilePlugin 28 March 2015 (e)"
#endif
;
static void * sCCPfn;
Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
===================================================================
--- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:51 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- FloatArrayPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ FloatArrayPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -72,9 +72,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatArrayPlugin 30 December 2014 (i)"
+ "FloatArrayPlugin 28 March 2015 (i)"
#else
- "FloatArrayPlugin 30 December 2014 (e)"
+ "FloatArrayPlugin 28 March 2015 (e)"
#endif
;
Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c
===================================================================
--- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:51 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- FloatMathPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ FloatMathPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -79,9 +79,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatMathPlugin 30 December 2014 (i)"
+ "FloatMathPlugin 28 March 2015 (i)"
#else
- "FloatMathPlugin 30 December 2014 (e)"
+ "FloatMathPlugin 28 March 2015 (e)"
#endif
;
Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c
===================================================================
--- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:51 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- GeniePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ GeniePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "GeniePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "GeniePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -61,23 +61,24 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "GeniePlugin v2.0 30 December 2014 (i)"
+ "GeniePlugin v2.0 28 March 2015 (i)"
#else
- "GeniePlugin v2.0 30 December 2014 (e)"
+ "GeniePlugin v2.0 28 March 2015 (e)"
#endif
;
+static sqInt simulator;
/* arguments are pointer to ints paired as x,y coordinates of points */
static sqInt cSquaredDistanceFromto(int *aPoint, int *bPoint) {
+ sqInt yDiff;
sqInt aPointX;
sqInt bPointX;
- sqInt xDiff;
sqInt aPointY;
sqInt bPointY;
- sqInt yDiff;
+ sqInt xDiff;
aPointX = aPoint[0];
aPointY = aPoint[1];
Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c
===================================================================
--- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:43 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:56 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- HostWindowPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ HostWindowPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -66,11 +66,12 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "HostWindowPlugin 30 December 2014 (i)"
+ "HostWindowPlugin 28 March 2015 (i)"
#else
- "HostWindowPlugin 30 December 2014 (e)"
+ "HostWindowPlugin 28 March 2015 (e)"
#endif
;
+static sqInt simulator;
Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
===================================================================
--- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:52 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- JPEGReadWriter2Plugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ JPEGReadWriter2Plugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -68,11 +68,12 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReadWriter2Plugin 30 December 2014 (i)"
+ "JPEGReadWriter2Plugin 28 March 2015 (i)"
#else
- "JPEGReadWriter2Plugin 30 December 2014 (e)"
+ "JPEGReadWriter2Plugin 28 March 2015 (e)"
#endif
;
+static sqInt simulator;
Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
===================================================================
--- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:52 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- JPEGReaderPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ JPEGReaderPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -136,9 +136,9 @@
static sqInt jsReadLimit;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReaderPlugin 30 December 2014 (i)"
+ "JPEGReaderPlugin 28 March 2015 (i)"
#else
- "JPEGReaderPlugin 30 December 2014 (e)"
+ "JPEGReaderPlugin 28 March 2015 (e)"
#endif
;
static int *residuals;
Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
===================================================================
--- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:52 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- JoystickTabletPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ JoystickTabletPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -62,11 +62,12 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JoystickTabletPlugin 30 December 2014 (i)"
+ "JoystickTabletPlugin 28 March 2015 (i)"
#else
- "JoystickTabletPlugin 30 December 2014 (e)"
+ "JoystickTabletPlugin 28 March 2015 (e)"
#endif
;
+static sqInt simulator;
Modified: trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c
===================================================================
--- trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:43 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:57 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
KedamaPlugin2 Kedama-Plugins-yo.1 uuid: 3fc7d691-0149-ba4d-a339-5d27cd44a2f8
*/
@@ -123,9 +123,9 @@
static unsigned int kedamaRandomSeed;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "KedamaPlugin2 30 December 2014 (i)"
+ "KedamaPlugin2 28 March 2015 (i)"
#else
- "KedamaPlugin2 30 December 2014 (e)"
+ "KedamaPlugin2 28 March 2015 (e)"
#endif
;
static unsigned int randA;
Modified: trunk/src/plugins/Klatt/Klatt.c
===================================================================
--- trunk/src/plugins/Klatt/Klatt.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/Klatt/Klatt.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:39 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:52 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- KlattSynthesizerPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ KlattSynthesizerPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -155,9 +155,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Klatt 30 December 2014 (i)"
+ "Klatt 28 March 2015 (i)"
#else
- "Klatt 30 December 2014 (e)"
+ "Klatt 28 March 2015 (e)"
#endif
;
static float nlast;
Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:39 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:52 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- LargeIntegersPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ LargeIntegersPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -122,6 +122,7 @@
#endif
;
static const int orOpIndex = 1;
+static sqInt simulator;
static const int xorOpIndex = 2;
@@ -187,8 +188,8 @@
static sqInt bytesgrowTo(sqInt aBytesObject, sqInt newLen) {
sqInt oldLen;
+ sqInt newBytes;
sqInt copyLen;
- sqInt newBytes;
interpreterProxy->pushRemappableOop(aBytesObject);
newBytes = interpreterProxy->instantiateClassindexableSize(interpreterProxy->fetchClassOf(aBytesObject), newLen);
@@ -691,8 +692,8 @@
}
static sqInt cDigitSublenwithleninto(unsigned char * pByteSmall, sqInt smallLen, unsigned char * pByteLarge, sqInt largeLen, unsigned char * pByteRes) {
+ unsigned int z;
sqInt i;
- unsigned int z;
/* Loop invariant is -1<=z<=0 */
@@ -790,10 +791,10 @@
/* Does not normalize. */
static sqInt digitLshift(sqInt aBytesOop, sqInt shiftCount) {
+ sqInt highBit;
+ sqInt newBytes;
+ sqInt oldLen;
sqInt newLen;
- sqInt oldLen;
- sqInt newBytes;
- sqInt highBit;
oldLen = interpreterProxy->slotSizeOf(aBytesOop);
if (((highBit = cDigitHighBitlen(interpreterProxy->firstIndexableField(aBytesOop), oldLen))) == 0) {
@@ -1184,10 +1185,10 @@
}
static sqInt isNormalized(sqInt anInteger) {
- sqInt ix;
sqInt len;
sqInt sLen;
sqInt minVal;
+ sqInt ix;
sqInt maxVal;
unsigned char *pointer;
unsigned char *pointer1;
@@ -1275,8 +1276,8 @@
/* First establish len = significant length. */
static sqInt normalizeNegative(sqInt aLargeNegativeInteger) {
+ sqInt len;
sqInt i;
- sqInt len;
sqInt sLen;
sqInt minVal;
sqInt oldLen;
@@ -1350,8 +1351,8 @@
sqInt i;
sqInt len;
sqInt sLen;
+ sqInt oldLen;
sqInt val;
- sqInt oldLen;
unsigned char *pointer;
unsigned char *pointer1;
@@ -1466,8 +1467,8 @@
}
EXPORT(sqInt) _primDigitBitShift(void) {
+ sqInt aLarge;
sqInt rShift;
- sqInt aLarge;
sqInt anInteger;
sqInt shiftCount;
sqInt _return_value;
@@ -1680,9 +1681,9 @@
}
EXPORT(sqInt) primDigitBitShift(void) {
+ sqInt anInteger;
+ sqInt rShift;
sqInt aLarge;
- sqInt rShift;
- sqInt anInteger;
sqInt shiftCount;
sqInt _return_value;
sqInt aLargeInteger;
@@ -1732,9 +1733,9 @@
}
EXPORT(sqInt) primDigitBitShiftMagnitude(void) {
+ sqInt anInteger;
+ sqInt rShift;
sqInt aLarge;
- sqInt rShift;
- sqInt anInteger;
sqInt shiftCount;
sqInt _return_value;
sqInt aLargeInteger;
Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c
===================================================================
--- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:39 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:52 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- LocalePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ LocalePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "LocalePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "LocalePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -71,11 +71,12 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "LocalePlugin 30 December 2014 (i)"
+ "LocalePlugin 28 March 2015 (i)"
#else
- "LocalePlugin 30 December 2014 (e)"
+ "LocalePlugin 28 March 2015 (e)"
#endif
;
+static sqInt simulator;
Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c
===================================================================
--- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:44 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:57 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- MIDIPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ MIDIPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -70,11 +70,12 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "MIDIPlugin 30 December 2014 (i)"
+ "MIDIPlugin 28 March 2015 (i)"
#else
- "MIDIPlugin 30 December 2014 (e)"
+ "MIDIPlugin 28 March 2015 (e)"
#endif
;
+static sqInt simulator;
Modified: trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
===================================================================
--- trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:39 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:53 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- Matrix2x3Plugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ Matrix2x3Plugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -74,9 +74,9 @@
static double m23ResultY;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Matrix2x3Plugin 30 December 2014 (i)"
+ "Matrix2x3Plugin 28 March 2015 (i)"
#else
- "Matrix2x3Plugin 30 December 2014 (e)"
+ "Matrix2x3Plugin 28 March 2015 (e)"
#endif
;
Modified: trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
===================================================================
--- trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:40 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:53 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ VMPluginCodeGenerator VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
from
- MiscPrimitivePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad
+ MiscPrimitivePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00
*/
-static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;
+static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.359 uuid: 3d5b8023-e045-437f-a85a-02036bc57e00 " __DATE__ ;
@@ -70,9 +70,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "MiscPrimitivePlugin 30 December 2014 (i)"
+ "MiscPrimitivePlugin 28 March 2015 (i)"
#else
- "MiscPrimitivePlugin 30 December 2014 (e)"
+ "MiscPrimitivePlugin 28 March 2015 (e)"
#endif
;
Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
===================================================================
--- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2015-03-26 20:23:09 UTC (rev 3295)
+++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2015-03-29 00:30:44 UTC (rev 3296)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:44 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.13.12 translated as C source on 28 March 2015 8:15:57 pm */
/* Automatically generated by
@@ Diff output truncated at 50000 characters. @@
1
0
David T. Lewis uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker-dtl.359.mcz
==================== Summary ====================
Name: VMMaker-dtl.359
Author: dtl
Time: 28 March 2015, 8:14:27.879 pm
UUID: 3d5b8023-e045-437f-a85a-02036bc57e00
Ancestors: VMMaker-dtl.358
VMMaker 4.13.12
Implement primitiveIsBigEnder. Platform endianness can be deduced from the image, but some images may find this awkward, so provide the primitive as an assist.
Additional simulation support from oscog.
Code generation updates from oscog (excluding type inferencer because of translation time dependencies).
Various refactoring cleanups.
Fix undeclareds.
Object memory is responsible for #bytesPerWord and #baseHeaderSize, make it so in StackInterpreter.
=============== Diff against VMMaker-dtl.358 ===============
Item was changed:
SystemOrganization addCategory: #'VMMaker-Building'!
SystemOrganization addCategory: #'VMMaker-Interpreter'!
SystemOrganization addCategory: #'VMMaker-InterpreterSimulation'!
SystemOrganization addCategory: #'VMMaker-Plugins'!
SystemOrganization addCategory: #'VMMaker-SmartSyntaxPlugins'!
SystemOrganization addCategory: #'VMMaker-Translation to C'!
SystemOrganization addCategory: #'VMMaker-Tests'!
SystemOrganization addCategory: #'VMMaker-Support'!
SystemOrganization addCategory: #'VMMaker-JIT'!
+ SystemOrganization addCategory: #'VMMaker-JITSimulation'!
Item was changed:
Object subclass: #CCodeGenerator
+ instanceVariableNames: 'translationDict inlineList constants variables variableDeclarations scopeStack methods macros apiMethods preparedMethodList variablesSetCache headerFiles globalVariableUsage useSymbolicConstants generateDeadCode doNotRemoveMethodList asArgumentTranslationDict receiverDict vmClass currentMethod logger declareMethodsStatic permitMethodPruning pools abstractDeclarations uncheckedAbstractMethods selectorTranslations breakSrcInlineSelector breakDestInlineSelector inlineReturnTypes'
- instanceVariableNames: 'translationDict inlineList constants variables variableDeclarations scopeStack methods macros preparedMethodList variablesSetCache headerFiles globalVariableUsage useSymbolicConstants generateDeadCode doNotRemoveMethodList asArgumentTranslationDict receiverDict vmClass currentMethod logger declareMethodsStatic permitMethodPruning pools abstractDeclarations uncheckedAbstractMethods selectorTranslations breakSrcInlineSelector breakDestInlineSelector inlineReturnTypes'
classVariableNames: 'UseRightShiftForDivide'
poolDictionaries: ''
category: 'VMMaker-Translation to C'!
!CCodeGenerator commentStamp: 'tpr 5/2/2003 14:30' prior: 0!
This class oversees the translation of a subset of Smalltalk to C, allowing the comforts of Smalltalk during development and the efficiency and portability of C for the resulting interpreter.
See VMMaker for more useful info!
Item was added:
+ ReadStream subclass: #FakeStdinStream
+ instanceVariableNames: 'atEnd simulator'
+ classVariableNames: ''
+ poolDictionaries: 'VMBasicConstants'
+ category: 'VMMaker-JITSimulation'!
+
+ !FakeStdinStream commentStamp: '<historical>' prior: 0!
+ Fake Standard input using a dialog to prompt for a line of input at a time.!
Item was added:
+ ----- Method: FakeStdinStream class>>for: (in category 'instance creation') -----
+ for: aCogVMSimulator
+ ^(self basicNew simulator: aCogVMSimulator)
+ on: (String new: 80) from: 1 to: 0
+
+ "self new next"!
Item was added:
+ ----- Method: FakeStdinStream class>>new (in category 'instance creation') -----
+ new
+ ^super on: (String new: 80) from: 1 to: 0
+
+ "self new next"!
Item was added:
+ ----- Method: FakeStdinStream>>atEnd (in category 'testing') -----
+ atEnd
+ ^atEnd ifNil: [atEnd := false]!
Item was added:
+ ----- Method: FakeStdinStream>>atEnd: (in category 'accessing') -----
+ atEnd: aBoolean
+ atEnd := aBoolean!
Item was added:
+ ----- Method: FakeStdinStream>>close (in category 'accessing') -----
+ close
+ atEnd := true!
Item was added:
+ ----- Method: FakeStdinStream>>next (in category 'accessing') -----
+ next
+ "Answer the next object in the Stream represented by the receiver.
+ If there are no more elements in the stream fill up the buffer by prompting for input"
+ | sem inputLine next |
+ position >= readLimit ifTrue:
+ [simulator isThreadedVM
+ ifTrue:
+ ["(simulator cogit singleStep not
+ and: [UIManager confirm: 'Single step?']) ifTrue:
+ [simulator cogit singleStep: true]."
+ "threadIndex := simulator disownVM: DisownVMLockOutFullGC." self flag: #FIXME. "oscog"
+ simulator forceInterruptCheckFromHeartbeat.
+ sem := Semaphore new.
+ WorldState addDeferredUIMessage:
+ [inputLine := UIManager default request: 'Input please!!'.
+ sem signal].
+ sem wait]
+ ifFalse:
+ [inputLine := UIManager default request: 'Input please!!'].
+ collection size <= inputLine size ifTrue:
+ [collection := collection species new: inputLine size + 1].
+ collection
+ replaceFrom: 1 to: inputLine size with: inputLine startingAt: 1;
+ at: (readLimit := inputLine size + 1) put: Character lf.
+ position := 0.
+ "simulator isThreadedVM ifTrue:
+ [simulator ownVM: threadIndex]" self flag: #FiXME "oscog"].
+ next := collection at: (position := position + 1).
+ "This is set temporarily to allow (FilePluginSimulator>>#sqFile:Read:Into:At:
+ to brwak out of its loop. sqFile:Read:Into:At: resets it on the way out."
+ atEnd := position >= readLimit.
+ ^next
+
+
+ " This does it with workspaces:
+ | ws r s |
+ s := Semaphore new.
+ ws := Workspace new contents: ''.
+ ws acceptAction: [:t| r := t asString. s signal].
+ [ws openLabel: 'Yo!!'; shouldStyle: false.
+ (ws dependents detect: [:dep | dep isKindOf: PluggableTextMorph] ifNone: [nil]) ifNotNil:
+ [:textMorph| textMorph acceptOnCR: true; hasUnacceptedEdits: true]] fork.
+ Processor activeProcess == Project uiProcess
+ ifTrue: [[r isNil] whileTrue: [World doOneCycle]]
+ ifFalse: [s wait].
+ ws topView delete.
+ s wait. s signal.
+ r"!
Item was added:
+ ----- Method: FakeStdinStream>>simulator: (in category 'initialize-release') -----
+ simulator: aCogVMSimulator
+ simulator := aCogVMSimulator.
+ atEnd := false!
Item was changed:
FilePlugin subclass: #FilePluginSimulator
+ instanceVariableNames: 'openFiles states'
- instanceVariableNames: 'openFiles'
classVariableNames: ''
poolDictionaries: ''
category: 'VMMaker-InterpreterSimulation'!
!FilePluginSimulator commentStamp: 'tpr 5/5/2003 12:02' prior: 0!
File plugin simulation for the VM simulator!
Item was added:
+ ----- Method: FilePluginSimulator>>createDirectory: (in category 'simulation') -----
+ createDirectory: aString
+ ^[FileDirectory default primCreateDirectory: aString.
+ true]
+ on: Error
+ do: [:ex| false]
+ !
Item was changed:
----- Method: FilePluginSimulator>>fileValueOf: (in category 'simulation') -----
fileValueOf: objectPointer
+ | index file |
- | index |
index := (interpreterProxy isIntegerObject: objectPointer)
ifTrue: [interpreterProxy integerValueOf: objectPointer]
ifFalse:
[((interpreterProxy isBytes: objectPointer)
+ and: [(interpreterProxy byteSizeOf: objectPointer) = (self sizeof: #SQFile)]) ifFalse:
- and: [(interpreterProxy byteSizeOf: objectPointer) = self bytesPerWord]) ifFalse:
[interpreterProxy primitiveFail.
^nil].
+ interpreterProxy longAt: objectPointer + interpreterProxy baseHeaderSize].
+ file := openFiles at: index.
+ "this attempts to preserve file positions across snapshots when debugging the VM
+ requires saving an image in full flight and pushing it over the cliff time after time..."
+ (file closed and: [states includesKey: file]) ifTrue:
+ [[:pos :isBinary|
+ file reopen; position: pos.
+ isBinary ifTrue:
+ [file binary]] valueWithArguments: (states at: file)].
+ ^file!
- interpreterProxy longAt: objectPointer + self baseHeaderSize].
- ^openFiles at: index!
Item was changed:
----- Method: FilePluginSimulator>>initialiseModule (in category 'initialize-release') -----
initialiseModule
"See FilePluginSimulator>>sqFileStdioHandlesInto:"
(openFiles := Dictionary new)
at: 0 put: (FakeStdinStream for: interpreterProxy interpreter); "stdin"
at: 1 put: Transcript; "stdout"
at: 2 put: Transcript. "stderr"
+ states := IdentityDictionary new.
^super initialiseModule!
Item was added:
+ ----- Method: FilePluginSimulator>>recordStateOf: (in category 'simulation') -----
+ recordStateOf: file
+ ([file position]
+ on: Error
+ do: [:ex| nil]) ifNotNil:
+ [:position|
+ states at: file put: {position. file isBinary}]!
Item was changed:
----- Method: FilePluginSimulator>>sqFile:Read:Into:At: (in category 'simulation') -----
sqFile: file Read: count Into: byteArrayIndex At: startIndex
| interpreter |
interpreter := interpreterProxy interpreter.
+ [[startIndex to: startIndex + count - 1 do:
- startIndex to: startIndex + count - 1 do:
[ :i |
+ file atEnd ifTrue:
+ [(file isKindOf: FakeStdinStream) ifTrue: [file atEnd: false].
+ ^i - startIndex].
+ interpreter
+ byteAt: byteArrayIndex + i
+ put: file next asInteger]]
+ on: Error
+ do: [:ex|
+ (file isKindOf: TranscriptStream) ifFalse: [ex pass].
+ ^0]]
+ ensure: [self recordStateOf: file].
- file atEnd ifTrue: [^i - startIndex].
- interpreter byteAt: byteArrayIndex + i put: file next asInteger].
^count!
Item was changed:
----- Method: FilePluginSimulator>>sqFile:SetPosition: (in category 'simulation') -----
sqFile: file SetPosition: newPosition
+ file position: newPosition.
+ self recordStateOf: file!
- file position: newPosition!
Item was changed:
----- Method: FilePluginSimulator>>sqFile:Truncate: (in category 'simulation') -----
sqFile: file Truncate: truncatePosition
+ file truncate: truncatePosition.
+ self recordStateOf: file!
- file truncate: truncatePosition!
Item was changed:
----- Method: FilePluginSimulator>>sqFile:Write:From:At: (in category 'simulation') -----
sqFile: file Write: count From: byteArrayIndex At: startIndex
| interpreter |
interpreter := interpreterProxy interpreter.
file isBinary
ifTrue:
[startIndex to: startIndex + count - 1 do:
[ :i | file nextPut: (interpreter byteAt: byteArrayIndex + i)]]
ifFalse:
[startIndex to: startIndex + count - 1 do:
[ :i | | byte |
byte := interpreter byteAt: byteArrayIndex + i.
file nextPut: (Character value: (byte == 12 "lf" ifTrue: [15"cr"] ifFalse: [byte]))]].
+ self recordStateOf: file.
^count!
Item was changed:
----- Method: FilePluginSimulator>>sqFileClose: (in category 'simulation') -----
sqFileClose: file
+ file close.
+ self recordStateOf: file!
- file close!
Item was removed:
- ----- Method: Interpreter>>isBigEnder (in category 'plugin support') -----
- isBigEnder
- "Answer true (non-zero) if running on a big endian machine."
- | endianness anInt cString len i |
- <var: 'cString' type: 'char *'>
- <var: 'endianness' declareC: 'static sqInt endianness = -1'>
- (endianness == -1) ifFalse: [^ endianness]. "answer cached value"
- len := self cCode: 'sizeof(anInt)'
- inSmalltalk: [^ (Smalltalk endianness == #little) not].
- cString := self cCode: '(char *) &anInt' inSmalltalk: [].
- i := 0.
- [i < len] whileTrue:
- [cString at: i put: i.
- i := i + 1].
- endianness := anInt bitAnd: 255.
- ^ endianness
- !
Item was added:
+ ----- Method: InterpreterPlugin class>>newFor: (in category 'simulation') -----
+ newFor: anUnsimulatedInterpreterPluginClass
+ "Overridden by SmartSyntaxPluginSimulator to wrap a specific plugin class."
+ ^self new!
Item was changed:
+ ----- Method: InterpreterPlugin class>>simulatorClass (in category 'simulation') -----
- ----- Method: InterpreterPlugin class>>simulatorClass (in category 'accessing') -----
simulatorClass
"For running from Smalltalk - answer a class that can be used to simulate the receiver, or nil if you want the primitives in this module to always fail, causing simulation to fall through to the Smalltalk code. By default every non-TestInterpreterPlugin can simulate itself."
^ self!
Item was changed:
----- Method: InterpreterPrimitives class>>requiredMethodNames (in category 'translation') -----
requiredMethodNames
+ "Return the list of method names that should be retained for export or other support reasons.
+ Include all of the selectors for primitives to ensure translation in slang browser."
- "return the list of method names that should be retained for export or other support reasons"
+ ^super requiredMethodNames,
+ #(floatArg: integerArg: methodArg: methodReturnValue: objectArg: primitiveMethod),
+ (self selectors select: [:e | 'primitive*' match: e])!
- ^super requiredMethodNames, #(floatArg: integerArg: methodArg: methodReturnValue: objectArg: primitiveMethod)!
Item was added:
+ ----- Method: InterpreterPrimitives>>isBigEnder (in category 'primitive support') -----
+ isBigEnder
+ "Answer true (non-zero) if running on a big endian machine."
+ | endianness anInt cString len i |
+ <var: 'cString' type: 'char *'>
+ <var: 'endianness' declareC: 'static sqInt endianness = -1'>
+ (endianness == -1) ifFalse: [^ endianness]. "answer cached value"
+ len := self cCode: 'sizeof(anInt)'
+ inSmalltalk: [^ (Smalltalk endianness == #little) not].
+ cString := self cCode: '(char *) &anInt' inSmalltalk: [].
+ i := 0.
+ [i < len] whileTrue:
+ [cString at: i put: i.
+ i := i + 1].
+ endianness := anInt bitAnd: 255.
+ ^ endianness
+ !
Item was added:
+ ----- Method: InterpreterPrimitives>>primitiveIsBigEnder (in category 'other primitives') -----
+ primitiveIsBigEnder
+ "Answer true if running on a big endian machine."
+ <export: true>
+ self isBigEnder
+ ifTrue: [self pop: 1 thenPush: objectMemory trueObject]
+ ifFalse: [self pop: 1 thenPush: objectMemory falseObject]
+ !
Item was changed:
----- Method: InterpreterPrimitives>>success: (in category 'primitive support') -----
success: successBoolean
"Set the state of the primitive failure code/success flag, iff successBoolean
is false. If primFailCode is non-zero a primitive has failed. If primFailCode
is greater than one then its value indicates the reason for failure."
"Use returnTypeC: #sqInt because that's the way it is defined in sq.h.
+ Use no explicit return so that Slang doesn't fail an inlining type-check when
- Use no explicit return so that Slang doesn't fail an inlin ingtype-check when
a primitive with return type void uses ^self success: false to exit."
<returnTypeC: #sqInt>
<inline: true>
successBoolean ifFalse:
["Don't overwrite an error code that has already been set."
self successful ifTrue:
[primFailCode := 1]]!
Item was changed:
----- Method: InterpreterProxy>>initialize (in category 'initialize') -----
initialize
- successFlag := true.
remapBuffer := OrderedCollection new.
stack := OrderedCollection new.
primFailCode := 0.
!
Item was added:
+ ----- Method: InterpreterSimulator>>interpreter (in category 'interpreter shell') -----
+ interpreter
+ ^self!
Item was added:
+ ----- Method: InterpreterSimulator>>isIntegerObject: (in category 'interpreter access') -----
+ isIntegerObject: objectPointer
+ "In simulation, an interpreter simulator serves as the interpreter proxy"
+ ^ objectMemory isIntegerObject: objectPointer!
Item was changed:
----- Method: InterpreterSimulator>>loadNewPlugin: (in category 'plugin support') -----
loadNewPlugin: pluginString
+ | plugin plugins simulatorClasses |
+ transcript cr; show: 'Looking for module ', pluginString.
+ "but *why*??"
+ (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: pluginString) ifTrue:
+ [transcript show: ' ... defeated'. ^nil].
+ plugins := InterpreterPlugin allSubclasses select: [:psc| psc moduleName asString = pluginString asString].
+ simulatorClasses := (plugins
+ select: [:psc| psc simulatorClass notNil]
+ thenCollect: [:psc| psc simulatorClass]) asSet.
+ simulatorClasses isEmpty ifTrue: [transcript show: ' ... not found'. ^nil].
+ simulatorClasses size > 1 ifTrue: [^self error: 'This won''t work...'].
+ plugins size > 1 ifTrue:
+ [transcript show: '...multiple plugin classes; choosing ', plugins last name].
+ plugin := simulatorClasses anyOne newFor: plugins last. "hopefully lowest in the hierarchy..."
- | plugin simClass |
- transcript cr; show:'Looking for module ', pluginString.
- (#('FloatArrayPlugin' 'Matrix2x3Plugin')
- includes: pluginString) ifTrue:
- [transcript show: ' ... defeated'. ^ nil].
- plugin := simClass := nil.
- InterpreterPlugin allSubclassesDo:[:plg|
- plg moduleName asString = pluginString asString ifTrue:[
- simClass := plg simulatorClass.
- plugin ifNil:[plugin := simClass]
- ifNotNil:[plugin == simClass ifFalse:[^self error:'This won''t work...']].
- ].
- ].
- plugin ifNil:[transcript show: ' ... not found'. ^nil].
- plugin := plugin new.
plugin setInterpreter: self. "Ignore return value from setInterpreter"
+ (plugin respondsTo: #initialiseModule) ifTrue:
+ [plugin initialiseModule ifFalse:
+ [transcript show: ' ... initialiser failed'. ^nil]]. "module initialiser failed"
- (plugin respondsTo: #initialiseModule) ifTrue:[
- plugin initialiseModule ifFalse:[transcript show: ' ... initialiser failed'.^nil]. "module initialiser failed"
- ].
pluginList := pluginList copyWith: (pluginString asString -> plugin).
+ transcript show: ' ... loaded'.
- transcript show:' ... loaded'.
^pluginList last!
Item was changed:
----- Method: InterpreterSimulator>>makeDirEntryName:size:createDate:modDate:isDir:fileSize: (in category 'file primitives') -----
makeDirEntryName: entryName size: entryNameSize
createDate: createDate modDate: modifiedDate
isDir: dirFlag fileSize: fileSize
| modDateOop createDateOop nameString results |
+ <var: 'entryName' type: 'char *'>
- self var: 'entryName' type: 'char *'.
"allocate storage for results, remapping newly allocated
oops in case GC happens during allocation"
+ self pushRemappableOop:
+ (self instantiateClass: (self splObj: ClassArray) indexableSize: 5).
+ self pushRemappableOop:
+ (self instantiateClass: (self splObj: ClassByteString) indexableSize: entryNameSize).
+ self pushRemappableOop: (self positive32BitIntegerFor: createDate).
+ self pushRemappableOop: (self positive32BitIntegerFor: modifiedDate).
- objectMemory pushRemappableOop:
- (objectMemory instantiateClass: (objectMemory splObj: ClassArray) indexableSize: 5).
- objectMemory pushRemappableOop:
- (objectMemory instantiateClass: (objectMemory splObj: ClassString) indexableSize: entryNameSize)..
- objectMemory pushRemappableOop: (self positive32BitIntegerFor: createDate).
- objectMemory pushRemappableOop: (self positive32BitIntegerFor: modifiedDate).
+ modDateOop := self popRemappableOop.
+ createDateOop := self popRemappableOop.
+ nameString := self popRemappableOop.
+ results := self popRemappableOop.
- modDateOop := objectMemory popRemappableOop.
- createDateOop := objectMemory popRemappableOop.
- nameString := objectMemory popRemappableOop.
- results := objectMemory popRemappableOop.
1 to: entryNameSize do: [ :i |
+ self storeByte: i-1 ofObject: nameString withValue: (entryName at: i) asciiValue.
- objectMemory storeByte: i-1 ofObject: nameString withValue: (entryName at: i) asciiValue.
].
+ self storePointer: 0 ofObject: results withValue: nameString.
+ self storePointer: 1 ofObject: results withValue: createDateOop.
+ self storePointer: 2 ofObject: results withValue: modDateOop.
- objectMemory storePointer: 0 ofObject: results withValue: nameString.
- objectMemory storePointer: 1 ofObject: results withValue: createDateOop.
- objectMemory storePointer: 2 ofObject: results withValue: modDateOop.
dirFlag
+ ifTrue: [ self storePointer: 3 ofObject: results withValue: objectMemory trueObject ]
+ ifFalse: [ self storePointer: 3 ofObject: results withValue: objectMemory falseObject ].
+ self storePointer: 4 ofObject: results
+ withValue: (self integerObjectOf: fileSize).
- ifTrue: [ objectMemory storePointer: 3 ofObject: results withValue: objectMemory getTrueObj ]
- ifFalse: [ objectMemory storePointer: 3 ofObject: results withValue: objectMemory getFalseObj ].
- objectMemory storePointer: 4 ofObject: results
- withValue: (objectMemory integerObjectOf: fileSize).
^ results
!
Item was added:
+ ----- Method: InterpreterSimulator>>primitiveDirectoryEntry (in category 'file primitives') -----
+ primitiveDirectoryEntry
+ | name pathName array result |
+ name := self stringOf: self stackTop.
+ pathName := self stringOf: (self stackValue: 1).
+
+ self successful ifFalse:
+ [^self primitiveFail].
+
+ array := FileDirectory default primLookupEntryIn: pathName name: name.
+ array == nil ifTrue:
+ [self pop: 3 thenPush: objectMemory nilObj.
+ ^array].
+ array == #badDirectoryPath ifTrue:
+ [self halt.
+ ^self primitiveFail].
+ array == #primFailed ifTrue:
+ [self halt.
+ ^self primitiveFail].
+
+ result := self makeDirEntryName: (array at: 1) size: (array at: 1) size
+ createDate: (array at: 2) modDate: (array at: 3)
+ isDir: (array at: 4) fileSize: (array at: 5).
+ self pop: 3.
+ self push: result!
Item was changed:
----- Method: InterpreterSimulator>>primitiveDirectoryLookup (in category 'file primitives') -----
primitiveDirectoryLookup
| index pathName array result |
index := self stackIntegerValue: 0.
pathName := (self stringOf: (self stackValue: 1)).
self successful ifFalse: [
^self primitiveFail.
].
array := FileDirectory default primLookupEntryIn: pathName index: index.
array == nil ifTrue: [
self pop: 3.
+ self push: objectMemory nilObj.
- self push: objectMemory getNilObj.
^array.
].
array == #badDirectoryPath ifTrue: [self halt.
^self primitiveFail.
].
result := self makeDirEntryName: (array at: 1) size: (array at: 1) size
createDate: (array at: 2) modDate: (array at: 3)
isDir: (array at: 4) fileSize: (array at: 5).
self pop: 3.
self push: result.
!
Item was changed:
----- Method: InterpreterSimulator>>writeImageFile:size:screenSize: (in category 'image save/restore') -----
writeImageFile: file size: numberOfBytesToWrite screenSize: screenSize
"Actually emit the first numberOfBytesToWrite object memory bytes onto the snapshot."
| headerSize |
objectMemory bytesPerWord = 4 ifFalse: [self error: 'Not rewritten for 64 bits yet'].
+ headerSize := 16 * objectMemory bytesPerWord.
- headerSize := 16 * self bytesPerWord.
{
self imageFormatVersion.
headerSize.
numberOfBytesToWrite.
objectMemory startOfMemory.
objectMemory getSpecialObjectsOop.
objectMemory getLastHash.
screenSize.
fullScreenFlag.
extraVMMemory
}
do: [:long | self putLong: long toFile: file].
"Pad the rest of the header."
7 timesRepeat: [self putLong: 0 toFile: file].
"Position the file after the header."
file position: headerSize.
"Write the object memory."
1 to: numberOfBytesToWrite // 4
do: [:index |
self
putLong: (objectMemory getMemory at: index)
toFile: file].
self success: true
!
Item was changed:
----- Method: InterpreterStackPages>>extraStackBytes (in category 'initialization') -----
extraStackBytes
"See initializeStack:numSlots:pageSize:stackLimitOffset:stackPageHeadroom:
``Because stack pages grow down...''"
+ ^self cCode: 'BYTES_PER_WORD' inSmalltalk: [0]!
- ^self cCode: 'BytesPerWord' inSmalltalk: [0]!
Item was removed:
- ----- Method: NewObjectMemory>>objectRepresentationClass (in category 'cog jit support') -----
- objectRepresentationClass
- <doNotGenerate>
- ^CogObjectRepresentationForSqueakV3!
Item was changed:
InterpreterPlugin subclass: #SmartSyntaxInterpreterPlugin
+ instanceVariableNames: 'simulator'
- instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'VMMaker-SmartSyntaxPlugins'!
!SmartSyntaxInterpreterPlugin commentStamp: '<historical>' prior: 0!
Subclass of InterpreterPlugin, used in connection with TestCodeGenerator for named primitives with type coercion specifications!
Item was changed:
+ ----- Method: SmartSyntaxInterpreterPlugin class>>simulatorClass (in category 'simulation') -----
- ----- Method: SmartSyntaxInterpreterPlugin class>>simulatorClass (in category 'instance creation') -----
simulatorClass
"For running from Smalltalk - answer a class that can be used to simulate the receiver, or nil if you want the primitives in this module to always fail, causing simulation to fall through to the Smalltalk code.
By default SmartSyntaxInterpreterPlugin answers nil because methods in these plugins are intended to be embedded in code that pushes and pops from the stack and therefore cannot be run independently. This wrapper code is generated when translated to C. But, unfortunately, this code is missing during simulation. There was an attempt to simulate this, but only the prologue code (getting arg from the stack) is simulated (see simulatePrologInContext:). The epologue code (popping args and pushing result) is not. So I am making this nil until this can be fixed.
Also, beware that primitive methods that take no args exactly match their primitive name (faking out InterpreterSimulator>>callExternalPrimitive:). They should only be called from within wrapper code that simulates the prologue and epilogue. Primitive method that take args don't have this accidental matching problem since their names contain colons while their primitive names do not. - ajh 8/21/2002"
^ nil!
Item was added:
+ ----- Method: SmartSyntaxInterpreterPlugin>>simulator (in category 'accessing') -----
+ simulator
+ <doNotGenerate>
+ ^simulator!
Item was added:
+ ----- Method: SmartSyntaxInterpreterPlugin>>simulator: (in category 'accessing') -----
+ simulator: aSmartSyntaxPluginSimulator
+ <doNotGenerate>
+ simulator := aSmartSyntaxPluginSimulator!
Item was changed:
----- Method: SmartSyntaxPluginSimulator>>setInterpreter: (in category 'initialize') -----
setInterpreter: anInterpreterProxy
interpreterProxy := anInterpreterProxy.
actualPlugin setInterpreter: anInterpreterProxy.
+ "self computeSignatureMap" self flag: #FIXME "part of the oscog type inferencing"!
- self computeSignatureMap!
Item was changed:
----- Method: StackInterpreter>>activateNewClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') -----
activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch
"Similar to activateNewMethod but for Closure and newMethod."
| numCopied outerContext theMethod closureIP |
<inline: true>
outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure.
numCopied := self copiedValueCountOfClosure: blockClosure.
theMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext.
self push: instructionPointer.
self push: framePointer.
framePointer := stackPointer.
self push: theMethod.
self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs).
self push: objectMemory nilObject. "FxThisContext field"
self push: (objectMemory fetchPointer: ReceiverIndex ofObject: outerContext).
"Copy the copied values..."
0 to: numCopied - 1 do:
[:i|
self push: (objectMemory
fetchPointer: i + ClosureFirstCopiedValueIndex
ofObject: blockClosure)].
self assert: (self frameIsBlockActivation: framePointer).
self assert: (self frameHasContext: framePointer) not.
"The initial instructions in the block nil-out remaining temps."
"the instruction pointer is a pointer variable equal to
+ method oop + ip + objectMemory baseHeaderSize
- method oop + ip + BaseHeaderSize
-1 for 0-based addressing of fetchByte
-1 because it gets incremented BEFORE fetching currentByte"
closureIP := self quickFetchInteger: ClosureStartPCIndex ofObject: blockClosure.
+ instructionPointer := theMethod + closureIP + objectMemory baseHeaderSize - 2.
- instructionPointer := theMethod + closureIP + self baseHeaderSize - 2.
self setMethod: theMethod.
"Now check for stack overflow or an event (interrupt, must scavenge, etc)"
stackPointer < stackLimit ifTrue:
[self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]!
Item was changed:
----- Method: StackInterpreter>>arrayValueOf: (in category 'utilities') -----
arrayValueOf: arrayOop
"Return the address of first indexable field of resulting array object, or fail if
the instance variable does not contain an indexable bytes or words object."
"Note: May be called by translated primitive code."
<returnTypeC: #'void *'>
((objectMemory isNonIntegerObject: arrayOop)
and: [objectMemory isWordsOrBytes: arrayOop]) ifTrue:
+ [^self cCoerceSimple: (self pointerForOop: arrayOop + objectMemory baseHeaderSize) to: #'void *'].
- [^self cCoerceSimple: (self pointerForOop: arrayOop + self baseHeaderSize) to: #'void *'].
self primitiveFail!
Item was changed:
----- Method: StackInterpreter>>checkStackIntegrity (in category 'object memory support') -----
checkStackIntegrity
"Perform an integrity/leak check using the heapMap. Assume
clearLeakMapAndMapAccesibleObjects has set a bit at each
object's header. Scan all objects accessible from the stack
checking that every pointer points to a header. Answer if no
dangling pointers were detected."
| ok |
<inline: false>
<var: #thePage type: #'StackPage *'>
<var: #theSP type: #'char *'>
<var: #theFP type: #'char *'>
<var: #callerFP type: #'char *'>
ok := true.
0 to: numStackPages - 1 do:
[:i| | thePage theSP theFP callerFP oop |
thePage := stackPages stackPageAt: i.
(stackPages isFree: thePage) ifFalse:
[thePage = stackPage
ifTrue:
[theSP := stackPointer.
theFP := framePointer]
ifFalse:
[theSP := thePage headSP.
theFP := thePage headFP].
"Skip the instruction pointer on top of stack of inactive pages."
thePage = stackPage ifFalse:
+ [theSP := theSP + objectMemory bytesPerWord].
- [theSP := theSP + self bytesPerWord].
[[theSP <= (theFP + FoxReceiver)] whileTrue:
[oop := stackPages longAt: theSP.
((objectMemory isNonIntegerObject: oop)
and: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue:
[self printFrameThing: 'object leak in frame temp' at: theSP; cr.
ok := false].
+ theSP := theSP + objectMemory bytesPerWord].
- theSP := theSP + self bytesPerWord].
(self frameHasContext: theFP) ifTrue:
[oop := self frameContext: theFP.
((objectMemory isIntegerObject: oop)
or: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue:
[self printFrameThing: 'object leak in frame ctxt' at: theFP + FoxThisContext; cr.
ok := false].
(self isContext: oop) ifFalse:
[self printFrameThing: 'frame ctxt should be context' at: theFP + FoxThisContext; cr.
ok := false]].
oop := self frameMethod: theFP.
((objectMemory isIntegerObject: oop)
or: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue:
[self printFrameThing: 'object leak in frame mthd' at: theFP + FoxMethod; cr.
ok := false].
(callerFP := self frameCallerFP: theFP) ~= 0] whileTrue:
+ [theSP := theFP + FoxCallerSavedIP + objectMemory bytesPerWord.
- [theSP := theFP + FoxCallerSavedIP + self bytesPerWord.
theFP := callerFP].
theSP := theFP + FoxCallerContext "a.k.a. FoxCallerSavedIP".
[theSP <= thePage baseAddress] whileTrue:
[oop := stackPages longAt: theSP.
((objectMemory isNonIntegerObject: oop)
and: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue:
[self printFrameThing: 'object leak in frame arg' at: theSP; cr.
ok := false].
+ theSP := theSP + objectMemory bytesPerWord]]].
- theSP := theSP + self bytesPerWord]]].
^ok!
Item was changed:
----- Method: StackInterpreter>>closureIn:numArgs:instructionPointer:copiedValues: (in category 'control primitives') -----
closureIn: context numArgs: numArgs instructionPointer: initialIP copiedValues: copiedValues
| newClosure numCopied |
<inline: true>
"numCopied should be zero for nil"
numCopied := objectMemory fetchWordLengthOf: copiedValues.
newClosure := objectMemory
eeInstantiateSmallClass: (objectMemory splObj: ClassBlockClosure)
+ sizeInBytes: (objectMemory bytesPerWord * (ClosureFirstCopiedValueIndex + numCopied)) + objectMemory baseHeaderSize.
- sizeInBytes: (self bytesPerWord * (ClosureFirstCopiedValueIndex + numCopied)) + self baseHeaderSize.
"Assume: have just allocated a new closure; it must be young. Thus, can use unchecked stores."
objectMemory storePointerUnchecked: ClosureOuterContextIndex ofObject: newClosure withValue: context.
objectMemory storePointerUnchecked: ClosureStartPCIndex ofObject: newClosure withValue: (objectMemory integerObjectOf: initialIP).
objectMemory storePointerUnchecked: ClosureNumArgsIndex ofObject: newClosure withValue: (objectMemory integerObjectOf: numArgs).
0 to: numCopied - 1 do:
[:i|
objectMemory storePointerUnchecked: i + ClosureFirstCopiedValueIndex
ofObject: newClosure
withValue: (objectMemory fetchPointer: i ofObject: copiedValues)].
^newClosure!
Item was changed:
----- Method: StackInterpreter>>closureIn:numArgs:instructionPointer:numCopiedValues: (in category 'control primitives') -----
closureIn: context numArgs: numArgs instructionPointer: initialIP numCopiedValues: numCopied
| newClosure |
<inline: true>
+ self assert: (objectMemory bytesPerWord * (ClosureFirstCopiedValueIndex + numCopied)) + objectMemory baseHeaderSize <= 252.
- self assert: (self bytesPerWord * (ClosureFirstCopiedValueIndex + numCopied)) + self baseHeaderSize <= 252.
newClosure := objectMemory
eeInstantiateSmallClass: (objectMemory splObj: ClassBlockClosure)
+ sizeInBytes: (objectMemory bytesPerWord * (ClosureFirstCopiedValueIndex + numCopied)) + objectMemory baseHeaderSize.
- sizeInBytes: (self bytesPerWord * (ClosureFirstCopiedValueIndex + numCopied)) + self baseHeaderSize.
"Assume: have just allocated a new closure; it must be young. Thus, can use unchecked stores."
objectMemory storePointerUnchecked: ClosureOuterContextIndex ofObject: newClosure withValue: context.
objectMemory storePointerUnchecked: ClosureStartPCIndex ofObject: newClosure withValue: (objectMemory integerObjectOf: initialIP).
objectMemory storePointerUnchecked: ClosureNumArgsIndex ofObject: newClosure withValue: (objectMemory integerObjectOf: numArgs).
^newClosure!
Item was changed:
----- Method: StackInterpreter>>commonReturn (in category 'return bytecodes') -----
commonReturn
"Note: Assumed to be inlined into the dispatch loop."
| closure home unwindContextOrNilOrZero frameToReturnTo contextToReturnTo theFP callerFP newPage |
<var: #frameToReturnTo type: #'char *'>
<var: #theFP type: #'char *'>
<var: #callerFP type: #'char *'>
<var: #newPage type: #'StackPage *'>
<var: #thePage type: #'StackPage *'>
<sharedCodeNamed: 'commonReturn' inCase: 120>
"If this is a method simply return to the sender/caller."
(self frameIsBlockActivation: localFP) ifFalse:
[^self commonCallerReturn].
"Since this is a block activation the closure is on the stack above any args and the frame."
closure := self pushedReceiverOrClosureOfFrame: localFP.
home := nil.
"Walk the closure's lexical chain to find the context or frame to return from (home)."
[closure ~~ objectMemory nilObject] whileTrue:
[home := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: closure.
closure := objectMemory fetchPointer: ClosureIndex ofObject: home].
"home is to be returned from provided there is no unwind-protect activation between
this frame and home's sender. Search for an unwind. findUnwindThroughContext:
will answer either the context for an unwind-protect activation or nilObj if the sender
cannot be found or 0 if no unwind is found but the sender is. We must update the
current page's headFrame pointers to enable the search to identify widowed contexts
correctly."
self writeBackHeadFramePointers.
unwindContextOrNilOrZero := self internalFindUnwindThroughContext: home.
unwindContextOrNilOrZero = objectMemory nilObject ifTrue:
["error: can't find home on chain; cannot return"
^self internalCannotReturn: localReturnValue].
unwindContextOrNilOrZero ~~ 0 ifTrue:
[^self internalAboutToReturn: localReturnValue through: unwindContextOrNilOrZero].
"Now we know home is on the sender chain.
We could be returning to either a context or a frame. Find out which."
contextToReturnTo := nil.
(self isMarriedOrWidowedContext: home)
ifTrue:
[self assert: (self checkIsStillMarriedContext: home currentFP: localFP).
theFP := self frameOfMarriedContext: home.
(self isBaseFrame: theFP)
ifTrue:
[contextToReturnTo := self frameCallerContext: theFP]
ifFalse:
[frameToReturnTo := self frameCallerFP: theFP]]
ifFalse:
[contextToReturnTo := objectMemory fetchPointer: SenderIndex ofObject: home.
((self isContext: contextToReturnTo)
and: [self isMarriedOrWidowedContext: contextToReturnTo]) ifTrue:
[self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP).
frameToReturnTo := self frameOfMarriedContext: contextToReturnTo.
contextToReturnTo := nil]].
"If returning to a context we must make a frame for it unless it is dead."
contextToReturnTo ~= nil ifTrue:
[frameToReturnTo := self establishFrameForContextToReturnTo: contextToReturnTo.
frameToReturnTo == 0 ifTrue:
["error: home's sender is dead; cannot return"
^self internalCannotReturn: localReturnValue]].
"Now we have a frame to return to. If it is on a different page we must free intervening pages and
nil out intervening contexts. We must free intervening stack pages because if we leave the pages
to be divorced then their contexts will be divorced with intact senders and instruction pointers. This
code is similar to primitiveTerminateTo. We must move any frames on itervening pages above the
frame linked to because these may be in use, e.g. via co-routining (see baseFrameReturn)."
self assert: stackPages pageListIsWellFormed.
newPage := stackPages stackPageFor: frameToReturnTo.
newPage ~~ stackPage ifTrue:
[| currentCtx thePage nextCntx |
currentCtx := self frameCallerContext: stackPage baseFP.
self assert: (self isContext: currentCtx).
stackPages freeStackPage: stackPage.
[self assert: (self isContext: currentCtx).
(self isMarriedOrWidowedContext: currentCtx)
and: [(stackPages stackPageFor: (theFP := self frameOfMarriedContext: currentCtx)) = newPage]] whileFalse:
[(self isMarriedOrWidowedContext: currentCtx)
ifTrue:
[thePage := stackPages stackPageFor: theFP.
theFP ~= thePage headFP ifTrue:
["Since we've just deallocated a page we know that newStackPage won't deallocate an existing one."
self moveFramesIn: thePage through: (self findFrameAbove: theFP inPage: thePage) toPage: self newStackPage].
currentCtx := self frameCallerContext: thePage baseFP.
self freeStackPage: thePage]
ifFalse:
[nextCntx := objectMemory fetchPointer: SenderIndex ofObject: currentCtx.
self markContextAsDead: currentCtx.
currentCtx := nextCntx]].
self setStackPageAndLimit: newPage.
localSP := stackPage headSP.
localFP := stackPage headFP].
"Two cases. Returning to the top frame on a new page or an interior frame on the current page.
The top frame has its instruction pointer on top of stack. An interior frame has its instruction pointer
in the caller frame. We need to peel back any frames on the page until we get to the correct frame."
localFP = frameToReturnTo
ifTrue: "pop the saved IP, push the return value and continue."
[localIP := self pointerForOop: self internalStackTop]
ifFalse:
[[callerFP := localFP.
localFP := self frameCallerFP: localFP.
localFP ~~ frameToReturnTo] whileTrue.
localIP := self frameCallerSavedIP: callerFP.
+ localSP := (self frameCallerSP: callerFP) - objectMemory bytesPerWord].
- localSP := (self frameCallerSP: callerFP) - self bytesPerWord].
self internalStackTopPut: localReturnValue.
self setMethod: (self frameMethod: localFP).
^self fetchNextBytecode!
Item was changed:
----- Method: StackInterpreter>>commonSend (in category 'message sending') -----
commonSend
"Send a message, starting lookup with the receiver's class."
"Assume: messageSelector and argumentCount have been set, and that
the receiver and arguments have been pushed onto the stack,"
"Note: This method is inlined into the interpreter dispatch loop."
<sharedCodeNamed: 'commonSend' inCase: 131>
+ self sendBreak: messageSelector + objectMemory baseHeaderSize
- self sendBreak: messageSelector + self baseHeaderSize
point: (objectMemory lengthOf: messageSelector)
receiver: (self internalStackValue: argumentCount).
self internalFindNewMethod.
self internalExecuteNewMethod.
self fetchNextBytecode!
Item was changed:
----- Method: StackInterpreter>>contextInstructionPointer:frame: (in category 'frame access') -----
contextInstructionPointer: theIP frame: theFP
<var: #theFP type: #'char *'>
self assert: (self validInstructionPointer: theIP inFrame: theFP).
+ ^objectMemory integerObjectOf: theIP - (self iframeMethod: theFP) - objectMemory baseHeaderSize + 2!
- ^objectMemory integerObjectOf: theIP - (self iframeMethod: theFP) - self baseHeaderSize + 2!
Item was changed:
----- Method: StackInterpreter>>convertFloatsToPlatformOrderFrom:to: (in category 'image save/restore') -----
convertFloatsToPlatformOrderFrom: startOop to: stopAddr
"Byte-swap the words of all bytes objects in a range of the
image, including Strings, ByteArrays, and CompiledMethods.
This returns these objects to their original byte ordering
after blindly byte-swapping the entire image. For compiled
methods, byte-swap only their bytecodes part.
Ensure floats are in platform-order."
| oop temp |
objectMemory vmEndianness = imageFloatsBigEndian ifTrue:
[^self].
self assert: ClassFloatCompactIndex ~= 0.
oop := startOop.
[self oop: oop isLessThan: stopAddr] whileTrue:
[(objectMemory isFreeObject: oop) ifFalse:
[(objectMemory compactClassIndexOf: oop) = ClassFloatCompactIndex ifTrue:
+ [temp := self longAt: oop + objectMemory baseHeaderSize.
+ self longAt: oop + objectMemory baseHeaderSize put: (self longAt: oop + objectMemory baseHeaderSize + 4).
+ self longAt: oop + objectMemory baseHeaderSize + 4 put: temp]].
- [temp := self longAt: oop + self baseHeaderSize.
- self longAt: oop + self baseHeaderSize put: (self longAt: oop + self baseHeaderSize + 4).
- self longAt: oop + self baseHeaderSize + 4 put: temp]].
oop := objectMemory objectAfter: oop]!
Item was changed:
----- Method: StackInterpreter>>createActualMessageTo: (in category 'message sending') -----
createActualMessageTo: lookupClass
"Bundle up the selector, arguments and lookupClass into a Message object.
In the process it pops the arguments off the stack, and pushes the message object.
This can then be presented as the argument of e.g. #doesNotUnderstand:"
| argumentArray message |
<inline: false> "This is a useful break-point"
self assert: ((objectMemory isIntegerObject: messageSelector) or: [objectMemory addressCouldBeObj: messageSelector]).
argumentArray := objectMemory eeInstantiateClass: (objectMemory splObj: ClassArray) indexableSize: argumentCount.
message := objectMemory eeInstantiateClass: (objectMemory splObj: ClassMessage) indexableSize: 0.
"Since the array is new can use unchecked stores."
+ (argumentCount - 1) * objectMemory bytesPerWord to: 0 by: objectMemory bytesPerWord negated do:
- (argumentCount - 1) * self bytesPerWord to: 0 by: self bytesPerWord negated do:
[:i|
+ self longAt: argumentArray + objectMemory baseHeaderSize + i put: self popStack].
- self longAt: argumentArray + self baseHeaderSize + i put: self popStack].
"Since message is new can use unchecked stores."
objectMemory storePointerUnchecked: MessageSelectorIndex ofObject: message withValue: messageSelector.
objectMemory storePointerUnchecked: MessageArgumentsIndex ofObject: message withValue: argumentArray.
objectMemory storePointerUnchecked: MessageLookupClassIndex ofObject: message withValue: lookupClass.
self push: message.
argumentCount := 1.!
Item was changed:
----- Method: StackInterpreter>>dbgFloatValueOf: (in category 'utilities') -----
dbgFloatValueOf: oop
"This version answers the value of a float or nil if not a flat *WITHOUT* setting successFlag or any other such nonsense. It is hence safe for use in debug printing. Sheesh."
| result |
<returnTypeC: #double>
<var: #result type: #double>
self flag: #Dan. "None of the float stuff has been converted for 64 bits"
((objectMemory isNonIntegerObject: oop)
and: [(objectMemory fetchClassOfNonInt: oop) = (objectMemory splObj: ClassFloat)]) ifTrue:
[self cCode: '' inSmalltalk: [result := Float new: 2].
+ objectMemory fetchFloatAt: oop + objectMemory baseHeaderSize into: result.
- objectMemory fetchFloatAt: oop + self baseHeaderSize into: result.
^result].
^nil!
Item was changed:
----- Method: StackInterpreter>>displayBitsOf:Left:Top:Right:Bottom: (in category 'I/O primitives') -----
displayBitsOf: aForm Left: l Top: t Right: r Bottom: b
"Repaint the portion of the Smalltalk screen bounded by the affected rectangle. Used to synchronize the screen after a Bitblt to the Smalltalk Display object."
| displayObj dispBits w h dispBitsIndex d left right top bottom surfaceHandle |
displayObj := objectMemory splObj: TheDisplay.
aForm = displayObj ifFalse: [^ nil].
self success: ((objectMemory isPointers: displayObj) and: [(objectMemory lengthOf: displayObj) >= 4]).
self successful ifTrue: [
dispBits := objectMemory fetchPointer: 0 ofObject: displayObj.
w := self fetchInteger: 1 ofObject: displayObj.
h := self fetchInteger: 2 ofObject: displayObj.
d := self fetchInteger: 3 ofObject: displayObj.
].
l < 0 ifTrue:[left := 0] ifFalse: [left := l].
r > w ifTrue: [right := w] ifFalse: [right := r].
t < 0 ifTrue: [top := 0] ifFalse: [top := t].
b > h ifTrue: [bottom := h] ifFalse: [bottom := b].
((left <= right) and: [top <= bottom]) ifFalse: [^nil].
self successful ifTrue: [
(objectMemory isIntegerObject: dispBits) ifTrue: [
surfaceHandle := objectMemory integerValueOf: dispBits.
showSurfaceFn = 0 ifTrue: [
showSurfaceFn := self ioLoadFunction: 'ioShowSurface' From: 'SurfacePlugin'.
showSurfaceFn = 0 ifTrue: [^self success: false]].
self cCode:'((sqInt (*)(sqInt, sqInt, sqInt, sqInt, sqInt))showSurfaceFn)(surfaceHandle, left, top, right-left, bottom-top)'.
] ifFalse: [
+ dispBitsIndex := dispBits + objectMemory baseHeaderSize. "index in memory byte array"
- dispBitsIndex := dispBits + self baseHeaderSize. "index in memory byte array"
self cCode: 'ioShowDisplay(dispBitsIndex, w, h, d, left, right, top, bottom)'
inSmalltalk: [self showDisplayBits: dispBitsIndex
w: w h: h d: d
left: left right: right top: top bottom: bottom]
].
]!
Item was changed:
----- Method: StackInterpreter>>divorceFramesIn: (in category 'frame access') -----
divorceFramesIn: aStackPage
| theFP calleeFP theSP theIP calleeContext theContext |
<inline: false>
<var: #aStackPage type: #'StackPage *'>
<var: #theFP type: #'char *'>
<var: #calleeFP type: #'char *'>
<var: #theSP type: #'char *'>
statStackPageDivorce := statStackPageDivorce + 1.
theFP := aStackPage headFP.
theSP := aStackPage headSP.
theIP := stackPages longAt: theSP.
+ theSP := theSP + objectMemory bytesPerWord. "theSP points at hottest item on frame's stack"
- theSP := theSP + self bytesPerWord. "theSP points at hottest item on frame's stack"
calleeContext := nil.
[theContext := self ensureFrameIsMarried: theFP SP: theSP.
self updateStateOfSpouseContextForFrame: theFP WithSP: theSP.
objectMemory storePointerUnchecked: InstructionPointerIndex
ofObject: theContext
withValue: (self contextInstructionPointer: theIP frame: theFP).
self assert: (self frameReceiver: theFP)
= (objectMemory fetchPointer: ReceiverIndex ofObject: theContext).
calleeContext ~~ nil ifTrue:
[objectMemory storePointer: SenderIndex
ofObject: calleeContext
withValue: theContext].
calleeContext := theContext.
calleeFP := theFP.
theIP := (self frameCallerSavedIP: theFP) asInteger.
theFP := self frameCallerFP: theFP.
theFP ~= 0] whileTrue:
["theSP points at stacked hottest item on frame's stack"
theSP := self frameCallerSP: calleeFP].
objectMemory storePointer: SenderIndex
ofObject: theContext
withValue: (self frameCallerContext: calleeFP).
"The page is now free; mark it so."
aStackPage baseFP: 0!
Item was changed:
----- Method: StackInterpreter>>encodeFrameFieldHasContext:isBlock:numArgs: (in category 'frame access') -----
encodeFrameFieldHasContext: hasContext "<Boolean>" isBlock: isBlock "<Boolean>" numArgs: numArgs
"For ``fast'' temporary access (ok, to mitigate slower temp access) we need
fast access to a method's numArgs. Could have a variable set on save and return.
We'll investigate this. For the moment we just use a byte in the frameFlags
field. This is endian dependent. Store numArgs in byte at FoxFrameFields + 1.
Store hasContext flag in top bit (allows for 64-bit tags) of byte at FoxFrameFields.
Make frameFields look like a SmallInteger for the benefit of gc (dubious)."
"bitsPerWord := BytesPerWord * 8"
<inline: true>
^VMBIGENDIAN
ifTrue: [1
+ + (numArgs << ((objectMemory bytesPerWord * 8) - 8))
+ + (hasContext ifTrue: [1 << ((objectMemory bytesPerWord * 8) - 16)] ifFalse: [0])
+ + (isBlock ifTrue: [1 << ((objectMemory bytesPerWord * 8) - 24)] ifFalse: [0])]
- + (numArgs << ((self bytesPerWord * 8) - 8))
- + (hasContext ifTrue: [1 << ((self bytesPerWord * 8) - 16)] ifFalse: [0])
- + (isBlock ifTrue: [1 << ((self bytesPerWord * 8) - 24)] ifFalse: [0])]
ifFalse: [1
+ (numArgs << 8)
+ (hasContext ifTrue: [1 << 16] ifFalse: [0])
+ (isBlock ifTrue: [1 << 24] ifFalse: [0])]!
Item was changed:
----- Method: StackInterpreter>>externalDivorceFrame:andContext: (in category 'frame access') -----
externalDivorceFrame: theFP andContext: ctxt
"Divorce a single frame and its context. If it is not the top frame of a stack this means splitting its stack."
| thePage onCurrent theSP callerCtx newPage frameAbove callerFP callerSP callerIP theIP |
<inline: false>
<var: #theFP type: #'char *'>
<var: #thePage type: #'StackPage *'>
<var: #theSP type: #'char *'>
<var: #newPage type: #'StackPage *'>
<var: #frameAbove type: #'char *'>
<var: #callerFP type: #'char *'>
<var: #callerSP type: #'char *'>
"stackPage needs to have current head pointers to avoid confusion."
self assert: theFP ~= framePointer.
self assert: (stackPage = 0 or: [stackPage = stackPages mostRecentlyUsedPage]).
thePage := stackPages stackPageFor: theFP.
(onCurrent := thePage = stackPage) ifFalse:
[stackPages markStackPageNextMostRecentlyUsed: thePage].
theSP := self findSPOf: theFP on: thePage.
self updateStateOfSpouseContextForFrame: theFP WithSP: theSP.
callerCtx := self ensureCallerContext: theFP.
(frameAbove := self findFrameAbove: theFP inPage: thePage) == 0
ifTrue: "If we're divorcing the top frame we can simply peel it off."
[theIP := stackPages longAt: thePage headSP]
ifFalse: "othewise move all frames above to a new stack and then peel the frame off."
[newPage := self newStackPage.
theIP := self oopForPointer: (self frameCallerSavedIP: frameAbove).
frameAbove := self moveFramesIn: thePage through: frameAbove toPage: newPage.
onCurrent
ifTrue:
[self setStackPageAndLimit: newPage.
framePointer := stackPage headFP.
stackPointer := stackPage headSP]
ifFalse:
[stackPages markStackPageMostRecentlyUsed: newPage].
self assert: (self frameCallerContext: frameAbove) = ctxt].
objectMemory storePointerUnchecked: InstructionPointerIndex
ofObject: ctxt
withValue: (self contextInstructionPointer: theIP frame: theFP).
objectMemory storePointer: SenderIndex
ofObject: ctxt
withValue: callerCtx.
callerFP := self frameCallerFP: theFP.
callerFP == 0 "theFP is a base frame; it is now alone; free the entire page"
ifTrue: [stackPages freeStackPage: thePage]
ifFalse:
[callerIP := self oopForPointer: (self frameCallerSavedIP: theFP).
+ callerSP := (self frameCallerSP: theFP) - objectMemory bytesPerWord.
- callerSP := (self frameCallerSP: theFP) - self bytesPerWord.
stackPages longAt: callerSP put: callerIP.
self setHeadFP: callerFP andSP: callerSP inPage: thePage]
!
Item was changed:
----- Method: StackInterpreter>>findSPOrNilOf:on:startingFrom: (in category 'frame access') -----
findSPOrNilOf: theFP on: thePage startingFrom: startFrame
"Search for the stack pointer for theFP. This points to the hottest item on the frame's stack.
DO NOT CALL THIS WITH theFP == localFP OR theFP == framePointer!!"
<var: #aFrame type: #'char *'>
<var: #theFP type: #'char *'>
<var: #thePage type: #'StackPage *'>
<returnTypeC: #'char *'>
| aFrame theSP |
<inline: true>
<asmLabel: false>
<var: #startFrame type: #'char *'>
<var: #theSP type: #'char *'>
self assert: (stackPages isFree: thePage) not.
aFrame := startFrame.
theSP := thePage headSP.
aFrame = theFP ifTrue:
[theSP >= aFrame ifTrue:
["If the SP is invalid return the pointer to the receiver field."
^self frameReceiverOffset: aFrame].
"Skip the instruction pointer on top of stack of inactive pages."
^thePage = stackPage
ifTrue: [theSP]
+ ifFalse: [theSP + objectMemory bytesPerWord]].
- ifFalse: [theSP + self bytesPerWord]].
[theSP := self frameCallerSP: aFrame.
aFrame := self frameCallerFP: aFrame.
aFrame ~= 0] whileTrue:
[theFP = aFrame ifTrue:
[^theSP]].
^nil!
Item was changed:
----- Method: StackInterpreter>>floatObjectOf: (in category 'object format') -----
floatObjectOf: aFloat
| newFloatObj |
<inline: false>
<var: #aFloat type: #double>
self flag: #Dan.
+ newFloatObj := objectMemory eeInstantiateSmallClass: (objectMemory splObj: ClassFloat) sizeInBytes: 8 + objectMemory baseHeaderSize.
+ objectMemory storeFloatAt: newFloatObj + objectMemory baseHeaderSize from: aFloat.
- newFloatObj := objectMemory eeInstantiateSmallClass: (objectMemory splObj: ClassFloat) sizeInBytes: 8 + self baseHeaderSize.
- objectMemory storeFloatAt: newFloatObj + self baseHeaderSize from: aFloat.
^ newFloatObj.
!
Item was changed:
----- Method: StackInterpreter>>floatValueOf: (in category 'utilities') -----
floatValueOf: oop
"Fetch the instance variable at the given index of the given object. Return the C double precision floating point value of that instance variable, or fail if it is not a Float."
"Note: May be called by translated primitive code."
| result |
<returnTypeC: #double>
<var: #result type: #double>
self flag: #Dan. "None of the float stuff has been converted for 64 bits"
"N.B. Because Slang always inlines assertClassOf:is:compactClassIndex:
(because assertClassOf:is:compactClassIndex: has an inline: pragma) the
phrase (self splObj: ClassArray) is expanded in-place and is _not_
evaluated if ClassArrayCompactIndex is non-zero."
self assertClassOf: oop
is: (objectMemory splObj: ClassFloat)
compactClassIndex: ClassFloatCompactIndex.
self successful ifTrue:
[self cCode: '' inSmalltalk: [result := Float new: 2].
+ objectMemory fetchFloatAt: oop + objectMemory baseHeaderSize into: result.
- objectMemory fetchFloatAt: oop + self baseHeaderSize into: result.
^result].
^0.0!
Item was changed:
----- Method: StackInterpreter>>frameCallerSP: (in category 'frame access') -----
frameCallerSP: theFP
"Answer the SP of the caller provided theFP is not a base frame.
This points to the hottest item on the caller frame's stack."
<var: #theFP type: #'char *'>
<returnTypeC: 'char *'>
<asmLabel: false>
self assert: (self isBaseFrame: theFP) not.
+ ^theFP + (self frameStackedReceiverOffset: theFP) + objectMemory bytesPerWord!
- ^theFP + (self frameStackedReceiverOffset: theFP) + self bytesPerWord!
Item was changed:
----- Method: StackInterpreter>>frameCallerStackPointer: (in category 'frame access') -----
frameCallerStackPointer: theFP
"Answer the stack pointer of the caller frame."
<var: #theFP type: #'char *'>
<returnTypeC: #'char *'>
<inline: true>
<asmLabel: false>
self assert: (self isBaseFrame: theFP) not.
+ ^theFP + (self frameStackedReceiverOffset: theFP) + objectMemory bytesPerWord!
- ^theFP + (self frameStackedReceiverOffset: theFP) + self bytesPerWord!
Item was changed:
----- Method: StackInterpreter>>frameInstructionPointerForContext:method: (in category 'frame access') -----
frameInstructionPointerForContext: aContext method: aMethod
"Answer the instruction pointer for usage in a frame (a pointer to a bytecode)
from the index instructionPointer in the given context."
^aMethod
+ (self quickFetchInteger: InstructionPointerIndex ofObject: aContext)
+ + objectMemory baseHeaderSize
- + self baseHeaderSize
- 2!
Item was changed:
----- Method: StackInterpreter>>frameStackedReceiver:numArgs: (in category 'frame access') -----
frameStackedReceiver: theFP numArgs: numArgs
"Answer the stacked receiver given the frame's argument count.
The receiver of a message send or the closure of a block activation is
always on the stack above any arguments and the frame itself. See the
diagram in StackInterpreter class>>initializeFrameIndices."
<inline: true>
<var: #theFP type: #'char *'>
+ ^stackPages longAt: theFP + FoxCallerSavedIP + objectMemory bytesPerWord + (numArgs << self shiftForWord)!
- ^stackPages longAt: theFP + FoxCallerSavedIP + self bytesPerWord + (numArgs << self shiftForWord)!
Item was changed:
----- Method: StackInterpreter>>frameStackedReceiverOffset: (in category 'frame access') -----
frameStackedReceiverOffset: theFP
"Answer the offset in bytes from the a frame pointer to its stacked receiver.
The receiver of a message send or the closure of a block activation is
always on the stack above any arguments and the frame itself. See the
diagram in StackInterpreter class>>initializeFrameIndices."
<inline: true>
<var: #theFP type: #'char *'>
+ ^FoxCallerSavedIP + objectMemory bytesPerWord + ((self frameNumArgs: theFP) << self shiftForWord)!
- ^FoxCallerSavedIP + self bytesPerWord + ((self frameNumArgs: theFP) << self shiftForWord)!
Item was changed:
----- Method: StackInterpreter>>frameStackedReceiverOffset:numArgs: (in category 'frame access') -----
frameStackedReceiverOffset: theFP numArgs: numArgs
"Answer the offset in bytes from the a frame pointer to its stacked receiver.
The receiver of a message send or the closure of a block activation is
always on the stack above any arguments and the frame itself. See the
diagram in StackInterpreter class>>initializeFrameIndices."
<inline: true>
<var: #theFP type: #'char *'>
+ ^FoxCallerSavedIP + objectMemory bytesPerWord + (numArgs << self shiftForWord)!
- ^FoxCallerSavedIP + self bytesPerWord + (numArgs << self shiftForWord)!
Item was changed:
----- Method: StackInterpreter>>getErrorObjectFromPrimFailCode (in category 'message sending') -----
getErrorObjectFromPrimFailCode
"Answer the errorCode object to supply to a failing primitive method that accepts one.
If there is a primitive error table and the primFailCode is a valid index there-in answer
the coprresponding entry in the table, otherwise simply answer the code as an integer."
| table |
primFailCode > 0 ifTrue:
[table := objectMemory splObj: PrimErrTableIndex.
+ primFailCode <= ((objectMemory lastPointerOf: table) // objectMemory bytesPerWord) ifTrue:
- primFailCode <= ((objectMemory lastPointerOf: table) // self bytesPerWord) ifTrue:
[^objectMemory fetchPointer: primFailCode - 1 ofObject: table]].
^objectMemory integerObjectOf: primFailCode!
Item was changed:
----- Method: StackInterpreter>>highBit: (in category 'stack pages') -----
highBit: anUnsignedValue
"This is a C implementation needed by stackPageByteSize when translated."
| shifted bitNo |
<var: #anUnsignedValue type: #usqInt>
<var: #shifted type: #usqInt>
shifted := anUnsignedValue.
bitNo := 0.
+ self cppIf: [objectMemory bytesPerWord > 4]
- self cppIf: [self bytesPerWord > 4]
ifTrue:
[shifted < (1 << 32) ifFalse:
[shifted := shifted >> 32.
bitNo := bitNo + 32]].
shifted < (1 << 16) ifFalse:
[shifted := shifted >> 16.
bitNo := bitNo + 16].
shifted < (1 << 8) ifFalse:
[shifted := shifted >> 8.
bitNo := bitNo + 8].
shifted < (1 << 4) ifFalse:
[shifted := shifted >> 4.
bitNo := bitNo + 4].
shifted < (1 << 2) ifFalse:
[shifted := shifted >> 2.
bitNo := bitNo + 2].
shifted < (1 << 1) ifFalse:
[shifted := shifted >> 1.
bitNo := bitNo + 1].
"shifted 0 or 1 now"
^bitNo + shifted!
Item was changed:
----- Method: StackInterpreter>>imageFormatCompatibilityVersion (in category 'image save/restore') -----
imageFormatCompatibilityVersion
"This VM is backward-compatible with the immediately preceeding version."
+ ^objectMemory bytesPerWord == 4 ifTrue: [6504] ifFalse: [68002]!
- ^self bytesPerWord == 4 ifTrue: [6504] ifFalse: [68002]!
Item was changed:
----- Method: StackInterpreter>>imageFormatVersion (in category 'image save/restore') -----
imageFormatVersion
"Return a magic constant that changes when the image format changes. Since the image reading code uses this to detect byte ordering, one must avoid version numbers that are invariant under byte reversal."
+ ^objectMemory bytesPerWord == 4 ifTrue: [6505] ifFalse: [68003]!
- ^self bytesPerWord == 4 ifTrue: [6505] ifFalse: [68003]!
Item was changed:
----- Method: StackInterpreter>>initStackPages (in category 'initialization') -----
initStackPages
"Initialize the stackPages. This version is only for simulation
because Slang refuses to inline it, which makes the alloca invalid."
| stackPageBytes stackPagesBytes theStackMemory |
stackPageBytes := self stackPageByteSize.
stackPagesBytes := self computeStackZoneSize.
theStackMemory := self
cCode: 'alloca(stackPagesBytes)'
inSmalltalk:
[stackPages := self stackPagesClass new.
stackPages initializeWithByteSize: stackPagesBytes for: self].
stackPages
initializeStack: theStackMemory
+ numSlots: stackPagesBytes / objectMemory bytesPerWord
+ pageSize: stackPageBytes / objectMemory bytesPerWord
- numSlots: stackPagesBytes / self bytesPerWord
- pageSize: stackPageBytes / self bytesPerWord
stackLimitOffset: self stackLimitOffset
stackPageHeadroom: self stackPageHeadroom!
Item was changed:
----- Method: StackInterpreter>>initStackPagesAndInterpret (in category 'initialization') -----
initStackPagesAndInterpret
"Initialize the stack pages and enter interpret. Use alloca'ed memory so that when
we have a JIT its stack pointer will be on the native stack since alloca allocates
memory on the stack. Certain thread systems use the native stack pointer as the
frame ID so putting the stack anywhere else can confuse the thread system."
"This should be in its own initStackPages method but Slang can't inline
C code strings."
| stackPageBytes stackPagesBytes theStackMemory |
<var: #theStackMemory type: #'void *'>
stackPageBytes := self stackPageByteSize.
stackPagesBytes := self computeStackZoneSize.
theStackMemory := self
cCode: 'alloca(stackPagesBytes)'
inSmalltalk:
[stackPages := self stackPagesClass new.
stackPages initializeWithByteSize: stackPagesBytes for: self].
stackPages
initializeStack: theStackMemory
+ numSlots: stackPagesBytes / objectMemory bytesPerWord
+ pageSize: stackPageBytes / objectMemory bytesPerWord
- numSlots: stackPagesBytes / self bytesPerWord
- pageSize: stackPageBytes / self bytesPerWord
stackLimitOffset: self stackLimitOffset
stackPageHeadroom: self stackPageHeadroom.
"Once the stack pages are initialized we can continue to bootstrap the system."
self loadInitialContext.
"We're ready for the heartbeat (poll interrupt)"
self ioInitHeartbeat.
self interpret.
^nil!
Item was changed:
----- Method: StackInterpreter>>initialPCForHeader:method: (in category 'compiled methods') -----
initialPCForHeader: methodHeader method: theMethod
+ ^theMethod + ((LiteralStart + (self literalCountOfHeader: methodHeader)) * objectMemory bytesPerWord) + objectMemory baseHeaderSize!
- ^theMethod + ((LiteralStart + (self literalCountOfHeader: methodHeader)) * self bytesPerWord) + self baseHeaderSize!
Item was changed:
----- Method: StackInterpreter>>internalPop: (in category 'internal interpreter access') -----
internalPop: nItems
"In the StackInterpreter stacks grow down."
+ localSP := localSP + (nItems * objectMemory bytesPerWord)!
- localSP := localSP + (nItems * self bytesPerWord)!
Item was changed:
----- Method: StackInterpreter>>internalPop:thenPush: (in category 'internal interpreter access') -----
internalPop: nItems thenPush: oop
"In the StackInterpreter stacks grow down."
+ stackPages longAtPointer: (localSP := localSP + ((nItems - 1) * objectMemory bytesPerWord)) put: oop!
- stackPages longAtPointer: (localSP := localSP + ((nItems - 1) * self bytesPerWord)) put: oop!
Item was changed:
----- Method: StackInterpreter>>internalPopStack (in category 'internal interpreter access') -----
internalPopStack
"In the StackInterpreter stacks grow down."
| top |
top := stackPages longAt: localSP.
+ localSP := localSP + objectMemory bytesPerWord.
- localSP := localSP + self bytesPerWord.
^top!
Item was changed:
----- Method: StackInterpreter>>internalPush: (in category 'internal interpreter access') -----
internalPush: object
"In the StackInterpreter stacks grow down."
+ stackPages longAtPointer: (localSP := localSP - objectMemory bytesPerWord) put: object!
- stackPages longAtPointer: (localSP := localSP - self bytesPerWord) put: object!
Item was changed:
----- Method: StackInterpreter>>internalStackValue: (in category 'internal interpreter access') -----
internalStackValue: offset
"In the StackInterpreter stacks grow down."
+ ^stackPages longAtPointer: localSP + (offset * objectMemory bytesPerWord)!
- ^stackPages longAtPointer: localSP + (offset * self bytesPerWord)!
Item was changed:
----- Method: StackInterpreter>>interpreterAllocationReserveBytes (in category 'stack pages') -----
interpreterAllocationReserveBytes
"At a rough approximation we may need to allocate up to a couple
of page's worth of contexts when switching stack pages, assigning
to senders, etc. But the snapshot primitive voids all stack pages.
So a safe margin is the size of a large context times the maximum
number of frames per page times the number of pages."
| availableBytesPerPage maxFramesPerPage |
availableBytesPerPage := self stackPageByteSize - self stackLimitOffset - self stackPageHeadroom.
+ maxFramesPerPage := availableBytesPerPage / objectMemory bytesPerWord // FrameSlots.
- maxFramesPerPage := availableBytesPerPage / self bytesPerWord // FrameSlots.
^2 raisedTo: (maxFramesPerPage * LargeContextSize * numStackPages) highBit!
Item was changed:
----- Method: StackInterpreter>>loadFloatOrIntFrom: (in category 'utilities') -----
loadFloatOrIntFrom: floatOrInt
"If floatOrInt is an integer, then convert it to a C double float and return it.
If it is a Float, then load its value and return it.
Otherwise fail -- ie return with primErrorCode non-zero."
| result |
<inline: true>
<asmLabel: false>
<returnTypeC: #double>
<var: #result type: #double>
(objectMemory isIntegerObject: floatOrInt) ifTrue:
[^(objectMemory integerValueOf: floatOrInt) asFloat].
self assertClassOf: floatOrInt
is: (objectMemory splObj: ClassFloat)
compactClassIndex: ClassFloatCompactIndex.
self cCode: '' inSmalltalk: [result := Float new: 2].
self successful ifTrue:
+ [objectMemory fetchFloatAt: floatOrInt + objectMemory baseHeaderSize into: result].
- [objectMemory fetchFloatAt: floatOrInt + self baseHeaderSize into: result].
^result!
Item was changed:
----- Method: StackInterpreter>>lookupMethodInClass: (in category 'message sending') -----
lookupMethodInClass: class
| currentClass dictionary found |
<inline: false>
self assert: class ~~ objectMemory nilObject.
currentClass := class.
[currentClass ~= objectMemory nilObject]
whileTrue:
[dictionary := objectMemory fetchPointer: MethodDictionaryIndex ofObject: currentClass.
dictionary = objectMemory nilObject ifTrue:
["MethodDict pointer is nil (hopefully due a swapped out stub)
-- raise exception #cannotInterpret:."
self createActualMessageTo: class.
messageSelector := objectMemory splObj: SelectorCannotInterpret.
+ self sendBreak: messageSelector + objectMemory baseHeaderSize
- self sendBreak: messageSelector + self baseHeaderSize
point: (objectMemory lengthOf: messageSelector)
receiver: nil.
^self lookupMethodInClass: (self superclassOf: currentClass)].
found := self lookupMethodInDictionary: dictionary.
found ifTrue: [^currentClass].
currentClass := self superclassOf: currentClass].
"Could not find #doesNotUnderstand: -- unrecoverable error."
messageSelector = (objectMemory splObj: SelectorDoesNotUnderstand) ifTrue:
[self error: 'Recursive not understood error encountered'].
"Cound not find a normal message -- raise exception #doesNotUnderstand:"
self createActualMessageTo: class.
messageSelector := objectMemory splObj: SelectorDoesNotUnderstand.
+ self sendBreak: messageSelector + objectMemory baseHeaderSize
- self sendBreak: messageSelector + self baseHeaderSize
point: (objectMemory lengthOf: messageSelector)
receiver: nil.
^self lookupMethodInClass: class!
Item was changed:
----- Method: StackInterpreter>>makeBaseFrameFor: (in category 'frame access') -----
makeBaseFrameFor: aContext "<Integer>"
"Marry aContext with the base frame of a new stack page. Build
the base frame to reflect the context's state. Answer the new page."
| page pointer theMethod numArgs stackPtrIndex maybeClosure |
<inline: false>
<var: #page type: #'StackPage *'>
<var: #pointer type: #'char *'>
<returnTypeC: 'StackPage *'>
self assert: (self isSingleContext: aContext).
page := self newStackPage.
pointer := page baseAddress.
theMethod := objectMemory fetchPointer: MethodIndex ofObject: aContext.
"If the frame is a closure activation then the closure should be on the stack in
the pushed receiver position (closures receiver the value[:value:] messages).
Otherwise it should be the receiver proper."
maybeClosure := (objectMemory fetchPointer: ClosureIndex ofObject: aContext).
maybeClosure ~= objectMemory nilObject
ifTrue: [numArgs := self argumentCountOfClosure: maybeClosure.
stackPages longAt: pointer put: maybeClosure]
ifFalse:
[numArgs := self argumentCountOf: theMethod.
stackPages longAt: pointer put: (objectMemory fetchPointer: ReceiverIndex ofObject: aContext)].
"Put the arguments on the stack"
1 to: numArgs do:
[:i|
stackPages
+ longAt: (pointer := pointer - objectMemory bytesPerWord)
- longAt: (pointer := pointer - self bytesPerWord)
put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)].
"saved caller ip is sender context in base frame"
stackPages
+ longAt: (pointer := pointer - objectMemory bytesPerWord)
- longAt: (pointer := pointer - self bytesPerWord)
put: (objectMemory fetchPointer: SenderIndex ofObject: aContext).
"base frame's saved fp is null"
stackPages
+ longAt: (pointer := pointer - objectMemory bytesPerWord)
- longAt: (pointer := pointer - self bytesPerWord)
put: 0.
page baseFP: pointer; headFP: pointer.
stackPages
+ longAt: (pointer := pointer - objectMemory bytesPerWord)
- longAt: (pointer := pointer - self bytesPerWord)
put: theMethod.
stackPages
+ longAt: (pointer := pointer - objectMemory bytesPerWord)
- longAt: (pointer := pointer - self bytesPerWord)
put: (self encodeFrameFieldHasContext: true isBlock: maybeClosure ~= objectMemory nilObject numArgs: numArgs).
self assert: (self frameHasContext: page baseFP).
self assert: (self frameNumArgs: page baseFP) == numArgs.
stackPages
+ longAt: (pointer := pointer - objectMemory bytesPerWord)
- longAt: (pointer := pointer - self bytesPerWord)
put: aContext.
stackPages
+ longAt: (pointer := pointer - objectMemory bytesPerWord)
- longAt: (pointer := pointer - self bytesPerWord)
put: (objectMemory fetchPointer: ReceiverIndex ofObject: aContext).
stackPtrIndex := self quickFetchInteger: StackPointerIndex ofObject: aContext.
self assert: ReceiverIndex + stackPtrIndex < (objectMemory lengthOf: aContext).
numArgs + 1 to: stackPtrIndex do:
[:i|
stackPages
+ longAt: (pointer := pointer - objectMemory bytesPerWord)
- longAt: (pointer := pointer - self bytesPerWord)
put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)].
"last thing on stack is the instruction pointer"
(objectMemory isIntegerObject: (objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext)) ifFalse:
[self error: 'context is not resumable'].
stackPages
+ longAt: (pointer := pointer - objectMemory bytesPerWord)
- longAt: (pointer := pointer - self bytesPerWord)
put: (self frameInstructionPointerForContext: aContext method: theMethod).
self assert: (objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext)
= (self contextInstructionPointer: (stackPages longAt: pointer) frame: page baseFP).
page headSP: pointer.
"Mark context as married by setting its sender to the frame pointer plus SmallInteger
tags and the InstructionPointer to the saved fp (which ensures correct alignment
w.r.t. the frame when we check for validity)"
objectMemory storePointerUnchecked: SenderIndex
ofObject: aContext
withValue: (self withSmallIntegerTags: page baseFP).
objectMemory storePointerUnchecked: InstructionPointerIndex
ofObject: aContext
withValue: (self withSmallIntegerTags: 0).
self assert: (objectMemory isIntegerObject: (objectMemory fetchPointer: SenderIndex ofObject: aContext)).
self assert: (self frameOfMarriedContext: aContext) = page baseFP.
^page!
Item was changed:
----- Method: StackInterpreter>>makePointwithxValue:yValue: (in category 'utilities') -----
makePointwithxValue: xValue yValue: yValue
"make a Point xValue@yValue.
We know both will be integers so no value nor root checking is needed"
| pointResult |
+ pointResult := objectMemory eeInstantiateSmallClass: (objectMemory splObj: ClassPoint) sizeInBytes: 3 * objectMemory bytesPerWord.
- pointResult := objectMemory eeInstantiateSmallClass: (objectMemory splObj: ClassPoint) sizeInBytes: 3 * self bytesPerWord.
objectMemory storePointerUnchecked: XIndex ofObject: pointResult withValue: (objectMemory integerObjectOf: xValue).
objectMemory storePointerUnchecked: YIndex ofObject: pointResult withValue: (objectMemory integerObjectOf: yValue).
^ pointResult!
Item was changed:
----- Method: StackInterpreter>>mapStackPages (in category 'object memory support') -----
mapStackPages
<inline: false>
<var: #thePage type: #'StackPage *'>
<var: #theSP type: #'char *'>
<var: #theFP type: #'char *'>
<var: #callerFP type: #'char *'>
<var: #theIPPtr type: #'char *'>
"Need to write back the frame pointers unless all pages are free (as in snapshot)"
stackPage ~= 0 ifTrue:
[self externalWriteBackHeadFramePointers].
0 to: numStackPages - 1 do:
[:i| | thePage theSP theFP callerFP theIPPtr theIP oop |
thePage := stackPages stackPageAt: i.
thePage isFree ifFalse:
[theSP := thePage headSP.
theFP := thePage headFP.
"Skip the instruction pointer on top of stack of inactive pages."
thePage = stackPage
ifTrue: [theIPPtr := 0]
ifFalse:
[theIPPtr := theSP.
+ theSP := theSP + objectMemory bytesPerWord].
- theSP := theSP + self bytesPerWord].
[self assert: (thePage addressIsInPage: theFP).
self assert: (thePage addressIsInPage: theSP).
self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theFP]).
[theSP <= (theFP + FoxReceiver)] whileTrue:
[oop := stackPages longAt: theSP.
(objectMemory isIntegerObject: oop) ifFalse:
[stackPages longAt: theSP put: (objectMemory remap: oop)].
+ theSP := theSP + objectMemory bytesPerWord].
- theSP := theSP + self bytesPerWord].
(self frameHasContext: theFP) ifTrue:
[stackPages
longAt: theFP + FoxThisContext
put: (objectMemory remap: (self frameContext: theFP))].
theIPPtr ~= 0 ifTrue:
[self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP).
theIP := (stackPages longAt: theIPPtr) - (self frameMethod: theFP)].
stackPages
longAt: theFP + FoxMethod
put: (objectMemory remap: (self frameMethod: theFP)).
theIPPtr ~= 0 ifTrue:
[stackPages longAt: theIPPtr put: theIP + (self frameMethod: theFP)].
(callerFP := self frameCallerFP: theFP) ~= 0] whileTrue:
+ [theSP := (theIPPtr := theFP + FoxCallerSavedIP) + objectMemory bytesPerWord.
- [theSP := (theIPPtr := theFP + FoxCallerSavedIP) + self bytesPerWord.
theFP := callerFP].
theSP := theFP + FoxCallerContext. "a.k.a. FoxCallerSavedIP"
[theSP <= thePage baseAddress] whileTrue:
[oop := stackPages longAt: theSP.
(objectMemory isIntegerObject: oop) ifFalse:
[stackPages longAt: theSP put: (objectMemory remap: oop)].
+ theSP := theSP + objectMemory bytesPerWord]]]!
- theSP := theSP + self bytesPerWord]]]!
Item was changed:
----- Method: StackInterpreter>>markAndTraceStackPage: (in category 'object memory support') -----
markAndTraceStackPage: thePage
| theSP theFP frameRcvrOffset callerFP oop |
<var: #thePage type: #'StackPage *'>
<var: #theSP type: #'char *'>
<var: #theFP type: #'char *'>
<var: #frameRcvrOffset type: #'char *'>
<var: #callerFP type: #'char *'>
<inline: false>
self assert: (stackPages isFree: thePage) not.
theSP := thePage headSP.
theFP := thePage headFP.
"Skip the instruction pointer on top of stack of inactive pages."
thePage = stackPage ifFalse:
+ [theSP := theSP + objectMemory bytesPerWord].
- [theSP := theSP + self bytesPerWord].
[frameRcvrOffset := self frameReceiverOffset: theFP.
[theSP <= frameRcvrOffset] whileTrue:
[oop := stackPages longAt: theSP.
(objectMemory isIntegerObject: oop) ifFalse:
[objectMemory markAndTrace: oop].
+ theSP := theSP + objectMemory bytesPerWord].
- theSP := theSP + self bytesPerWord].
(self frameHasContext: theFP) ifTrue:
[self assert: (self isContext: (self frameContext: theFP)).
objectMemory markAndTrace: (self frameContext: theFP)].
objectMemory markAndTrace: (self iframeMethod: theFP).
(callerFP := self frameCallerFP: theFP) ~= 0] whileTrue:
+ [theSP := theFP + FoxCallerSavedIP + objectMemory bytesPerWord.
- [theSP := theFP + FoxCallerSavedIP + self bytesPerWord.
theFP := callerFP].
theSP := self isCog
+ ifTrue: [theFP + FoxCallerSavedIP + objectMemory bytesPerWord] "caller ip is ceBaseReturnPC"
- ifTrue: [theFP + FoxCallerSavedIP + self bytesPerWord] "caller ip is ceBaseReturnPC"
ifFalse: [theFP + FoxCallerSavedIP]. "caller ip is frameCallerContext in a base frame"
[theSP <= thePage baseAddress] whileTrue:
[oop := stackPages longAt: theSP.
(objectMemory isIntegerObject: oop) ifFalse:
[objectMemory markAndTrace: oop].
+ theSP := theSP + objectMemory bytesPerWord]!
- theSP := theSP + self bytesPerWord]!
Item was changed:
----- Method: StackInterpreter>>marriedContext:pointsTo:stackDeltaForCurrentFrame: (in category 'frame access') -----
marriedContext: spouseContext pointsTo: anOop stackDeltaForCurrentFrame: stackDeltaForCurrentFrame
"This is a helper for primitiveObjectPointsTo so it *does not* check the frameContext field because that is an implicit self-reference not present in the stale ."
| theFP thePage theSP rcvrOffset |
<inline: false>
<var: #theFP type: #'char *'>
<var: #thePage type: #'StackPage *'>
<var: #theSP type: #'char *'>
<var: #rcvrOffset type: #'char *'>
theFP := self frameOfMarriedContext: spouseContext.
theFP = framePointer
+ ifTrue: [theSP := stackPointer + (stackDeltaForCurrentFrame * objectMemory bytesPerWord)]
- ifTrue: [theSP := stackPointer + (stackDeltaForCurrentFrame * self bytesPerWord)]
ifFalse:
[thePage := stackPages stackPageFor: theFP.
theSP := self findSPOf: theFP on: thePage].
(objectMemory isIntegerObject: anOop)
ifTrue: "Check stack and instruction pointer fields."
[(anOop = (objectMemory integerObjectOf: (self stackPointerIndexForFrame: theFP WithSP: theSP))
or: [anOop = (self externalInstVar: InstructionPointerIndex ofContext: spouseContext)]) ifTrue:
[^true]]
ifFalse: "Check method and sender fields, avoiding unnecessarily reifying sender context."
[anOop = (self frameMethodObject: theFP) ifTrue:
[^true].
(self isBaseFrame: theFP)
ifTrue: [anOop = (self frameCallerContext: theFP) ifTrue:
[^true]]
ifFalse: [((self frameHasContext: (self frameCallerFP: theFP))
and: [anOop = (self frameContext: (self frameCallerFP: theFP))]) ifTrue:
[^true]]].
"Now check receiver, temps and stack contents"
rcvrOffset := self frameReceiverOffset: theFP.
[theSP <= rcvrOffset] whileTrue:
[anOop = (stackPages longAt: theSP) ifTrue:
[^true].
+ theSP := theSP + objectMemory bytesPerWord].
- theSP := theSP + self bytesPerWord].
"Finally check stacked receiver (closure field or duplicate of receiver) and arguments"
+ theSP := theFP + FoxCallerSavedIP + objectMemory bytesPerWord.
- theSP := theFP + FoxCallerSavedIP + self bytesPerWord.
rcvrOffset := theFP + (self frameStackedReceiverOffset: theFP).
[theSP <= rcvrOffset] whileTrue:
[anOop = (stackPages longAt: theSP) ifTrue:
[^true].
+ theSP := theSP + objectMemory bytesPerWord].
- theSP := theSP + self bytesPerWord].
^false!
Item was changed:
----- Method: StackInterpreter>>marryFrame:SP: (in category 'frame access') -----
marryFrame: theFP SP: theSP
"Marry an unmarried frame. This means creating a spouse context
initialized with a subset of the frame's state (state through the last argument)
that references the frame."
| theContext methodHeader byteSize numArgs numStack closureOrNil |
<inline: false>
<var: #theFP type: #'char *'>
<var: #theSP type: #'char *'>
self assert: (self frameHasContext: theFP) not.
methodHeader := self headerOf: (self frameMethod: theFP).
"Decide how much of the stack to preserve in widowed contexts. Preserving too much
state will potentially hold onto garbage. Holding onto too little may mean that a dead
context isn't informative enough in a debugging situation. We compromise, retaining
only the arguments with no temporaries. Note that we still set the stack pointer to its
current value, but stack contents other than the arguments are nil."
numArgs := self frameNumArgs: theFP.
numStack := self stackPointerIndexForFrame: theFP WithSP: theSP.
closureOrNil := (self frameIsBlockActivation: theFP)
ifTrue: [self pushedReceiverOrClosureOfFrame: theFP]
ifFalse: [objectMemory nilObject].
byteSize := (methodHeader bitAnd: LargeContextBit) ~= 0
ifTrue: [LargeContextSize]
ifFalse: [SmallContextSize].
theContext := objectMemory eeInstantiateMethodContextByteSize: byteSize.
+ self assert: numStack + ReceiverIndex << self shiftForWord + objectMemory baseHeaderSize <= byteSize.
- self assert: numStack + ReceiverIndex << self shiftForWord + self baseHeaderSize <= byteSize.
"Mark context as married by setting its sender to the frame pointer plus SmallInteger
tags and the InstructionPointer to the saved fp (which ensures correct alignment
w.r.t. the frame when we check for validity)"
objectMemory storePointerUnchecked: SenderIndex
ofObject: theContext
withValue: (self withSmallIntegerTags: theFP).
objectMemory storePointerUnchecked: InstructionPointerIndex
ofObject: theContext
withValue: (self withSmallIntegerTags: (self frameCallerFP: theFP)).
objectMemory storePointerUnchecked: StackPointerIndex
ofObject: theContext
withValue: (objectMemory integerObjectOf: numStack).
objectMemory storePointerUnchecked: MethodIndex
ofObject: theContext
withValue: (self frameMethod: theFP).
objectMemory storePointerUnchecked: ClosureIndex ofObject: theContext withValue: closureOrNil.
objectMemory storePointerUnchecked: ReceiverIndex
ofObject: theContext
withValue: (self frameReceiver: theFP).
"Store just the arguments. If the frame is divorced the context
will have valid arguments but all temporaries will be nil."
1 to: numArgs do:
[:i|
objectMemory storePointerUnchecked: ReceiverIndex + i
ofObject: theContext "inline self temporary: i - 1 in:theFP"
withValue: (stackPages longAt: theFP
+ FoxCallerSavedIP
+ + ((numArgs - i + 1) * objectMemory bytesPerWord))].
- + ((numArgs - i + 1) * self bytesPerWord))].
numArgs + 1 to: numStack do:
[:i|
objectMemory storePointerUnchecked: ReceiverIndex + i
ofObject: theContext
withValue: objectMemory nilObject].
stackPages longAt: theFP + FoxThisContext put: theContext.
stackPages byteAt: theFP + FoxFrameFlags + 2 put: 1.
self assert: (self frameHasContext: theFP).
self assert: (self frameOfMarriedContext: theContext) = theFP.
self assert: numStack + ReceiverIndex < (objectMemory lengthOf: theContext).
^theContext
!
Item was changed:
----- Method: StackInterpreter>>moveFramesIn:through:toPage: (in category 'frame access') -----
moveFramesIn: oldPage through: theFP toPage: newPage
"Move frames from the hot end of oldPage through to theFP to newPage.
This has the effect of making theFP a base frame which can be stored into.
Answer theFP's new location."
| newSP newFP stackedReceiverOffset delta callerFP callerIP fpInNewPage offsetCallerFP theContext |
<inline: false>
<var: #oldPage type: #'StackPage *'>
<var: #theFP type: #'char *'>
<var: #newPage type: #'StackPage *'>
<var: #newSP type: #'char *'>
<var: #newFP type: #'char *'>
<var: #callerFP type: #'char *'>
<var: #fpInNewPage type: #'char *'>
<var: #offsetCallerFP type: #'char *'>
<var: #source type: #'char *'>
<returnTypeC: 'char *'>
+ newSP := newPage baseAddress + objectMemory bytesPerWord.
- newSP := newPage baseAddress + self bytesPerWord.
stackedReceiverOffset := self frameStackedReceiverOffset: theFP.
"First move the data. We will fix up frame pointers later."
theFP + stackedReceiverOffset
to: oldPage headSP
+ by: objectMemory bytesPerWord negated
- by: self bytesPerWord negated
do: [:source|
+ newSP := newSP - objectMemory bytesPerWord.
- newSP := newSP - self bytesPerWord.
stackPages longAt: newSP put: (stackPages longAt: source)].
"newSP = oldSP + delta => delta = newSP - oldSP"
delta := newSP - oldPage headSP.
newFP := newPage baseAddress - stackedReceiverOffset.
self setHeadFP: oldPage headFP + delta andSP: newSP inPage: newPage.
newPage baseFP: newFP.
callerFP := self frameCallerFP: theFP.
self assert: (self isBaseFrame: theFP) not.
self assert: (self frameHasContext: callerFP).
callerIP := self oopForPointer: (self frameCallerSavedIP: theFP).
stackPages longAt: theFP + stackedReceiverOffset put: callerIP.
oldPage
headFP: callerFP;
headSP: theFP + stackedReceiverOffset.
"Mark the new base frame in the new page (FoxCallerContext a.k.a. FoxCallerSavedIP)"
stackPages longAt: newFP + FoxCallerContext put: (self frameContext: callerFP).
stackPages longAt: newFP + FoxSavedFP put: 0.
"Now relocate frame pointers, updating married contexts to refer to their moved spouse frames."
fpInNewPage := newPage headFP.
[offsetCallerFP := self frameCallerFP: fpInNewPage.
offsetCallerFP ~= 0 ifTrue:
[offsetCallerFP := offsetCallerFP + delta].
stackPages longAt: fpInNewPage + FoxSavedFP put: (self oopForPointer: offsetCallerFP).
(self frameHasContext: fpInNewPage) ifTrue:
[theContext := self frameContext: fpInNewPage.
objectMemory storePointerUnchecked: SenderIndex
ofObject: theContext
withValue: (self withSmallIntegerTags: fpInNewPage).
objectMemory storePointerUnchecked: InstructionPointerIndex
ofObject: theContext
withValue: (self withSmallIntegerTags: offsetCallerFP)].
fpInNewPage := offsetCallerFP.
fpInNewPage ~= 0] whileTrue.
^newFP!
Item was changed:
----- Method: StackInterpreter>>pop: (in category 'internal interpreter access') -----
pop: nItems
<inline: true>
"In the StackInterpreter stacks grow down."
+ stackPointer := stackPointer + (nItems * objectMemory bytesPerWord).
- stackPointer := stackPointer + (nItems * self bytesPerWord).
^nil!
Item was changed:
----- Method: StackInterpreter>>pop:thenPush: (in category 'internal interpreter access') -----
pop: nItems thenPush: oop
"In the StackInterpreter stacks grow down."
| sp |
<inline: true>
<var: #sp type: #'char *'>
+ stackPages longAt: (sp := stackPointer + ((nItems - 1) * objectMemory bytesPerWord)) put: oop.
- stackPages longAt: (sp := stackPointer + ((nItems - 1) * self bytesPerWord)) put: oop.
stackPointer := sp!
Item was changed:
----- Method: StackInterpreter>>pop:thenPushBool: (in category 'internal interpreter access') -----
pop: nItems thenPushBool: trueOrFalse
"In the StackInterpreter stacks grow down."
| sp |
<inline: true>
<var: #sp type: #'char *'>
stackPages
+ longAt: (sp := stackPointer + ((nItems - 1) * objectMemory bytesPerWord))
- longAt: (sp := stackPointer + ((nItems - 1) * self bytesPerWord))
put: (trueOrFalse ifTrue: [objectMemory trueObject] ifFalse: [objectMemory falseObject]).
stackPointer := sp!
Item was changed:
----- Method: StackInterpreter>>pop:thenPushFloat: (in category 'internal interpreter access') -----
pop: nItems thenPushFloat: f
"In the StackInterpreter stacks grow down."
| sp |
<inline: true>
<var: #f type: #double>
<var: #sp type: #'char *'>
stackPages
+ longAt: (sp := stackPointer + ((nItems - 1) * objectMemory bytesPerWord))
- longAt: (sp := stackPointer + ((nItems - 1) * self bytesPerWord))
put: (self floatObjectOf: f).
stackPointer := sp!
Item was changed:
----- Method: StackInterpreter>>pop:thenPushInteger: (in category 'internal interpreter access') -----
pop: nItems thenPushInteger: integerVal
"lots of places pop a few items off the stack and then push an integer. Make it convenient.
In the StackInterpreter stacks grow down."
| sp |
<var: #sp type: #'char *'>
stackPages
+ longAt: (sp := stackPointer + ((nItems - 1) * objectMemory bytesPerWord))
- longAt: (sp := stackPointer + ((nItems - 1) * self bytesPerWord))
put: (objectMemory integerObjectOf: integerVal).
stackPointer := sp!
Item was changed:
----- Method: StackInterpreter>>popFloat (in category 'stack bytecodes') -----
popFloat
"Note: May be called by translated primitive code."
| top result |
<returnTypeC: #double>
<var: #result type: #double>
top := self popStack.
"N.B. Because Slang always inlines assertClassOf:is:compactClassIndex:
(because assertClassOf:is:compactClassIndex: has an inline: pragma) the
phrase (self splObj: ClassArray) is expanded in-place and is _not_
evaluated if ClassArrayCompactIndex is non-zero."
self assertClassOf: top
is: (objectMemory splObj: ClassFloat)
compactClassIndex: ClassFloatCompactIndex.
self successful ifTrue:
[self cCode: '' inSmalltalk: [result := Float new: 2].
+ objectMemory fetchFloatAt: top + objectMemory baseHeaderSize into: result].
- objectMemory fetchFloatAt: top + self baseHeaderSize into: result].
^ result!
Item was changed:
----- Method: StackInterpreter>>popStack (in category 'internal interpreter access') -----
popStack
"In the StackInterpreter stacks grow down."
| top |
<inline: true>
top := stackPages longAt: stackPointer.
+ stackPointer := stackPointer + objectMemory bytesPerWord.
- stackPointer := stackPointer + self bytesPerWord.
^top!
Item was changed:
----- Method: StackInterpreter>>positive32BitIntegerFor: (in category 'primitive support') -----
positive32BitIntegerFor: integerValue
| newLargeInteger |
"Note - integerValue is interpreted as POSITIVE, eg, as the result of
Bitmap>at:, or integer>bitAnd:."
integerValue >= 0
ifTrue: [(objectMemory isIntegerValue: integerValue)
ifTrue: [^ objectMemory integerObjectOf: integerValue]].
+ self cppIf: objectMemory bytesPerWord = 4
- self cppIf: self bytesPerWord = 4
ifTrue: "Faster instantiateSmallClass: currently only works with integral word size."
[newLargeInteger := objectMemory
eeInstantiateSmallClass: (objectMemory splObj: ClassLargePositiveInteger)
+ sizeInBytes: objectMemory baseHeaderSize + 4]
- sizeInBytes: self baseHeaderSize + 4]
ifFalse: "Cant use instantiateSmallClass: due to integral word requirement."
[newLargeInteger := objectMemory
eeInstantiateClass: (objectMemory splObj: ClassLargePositiveInteger)
indexableSize: 4].
objectMemory storeByte: 3 ofObject: newLargeInteger withValue: ((integerValue >> 24) bitAnd: 16rFF).
objectMemory storeByte: 2 ofObject: newLargeInteger withValue: ((integerValue >> 16) bitAnd: 16rFF).
objectMemory storeByte: 1 ofObject: newLargeInteger withValue: ((integerValue >> 8) bitAnd: 16rFF).
objectMemory storeByte: 0 ofObject: newLargeInteger withValue: (integerValue bitAnd: 16rFF).
^newLargeInteger!
Item was changed:
----- Method: StackInterpreter>>primitiveObject:perform:withArguments:lookedUpIn: (in category 'control primitives') -----
primitiveObject: actualReceiver perform: selector withArguments: argumentArray lookedUpIn: lookupClass
"Common routine used by perform:withArgs:, perform:withArgs:inSuperclass:,
object:perform:withArgs:inClass: et al. Answer nil on success.
NOTE: The case of doesNotUnderstand: is not a failure to perform.
The only failures are arg types and consistency of argumentCount.
Since we're in the stack VM we can assume there is space to push the arguments
provided they are within limits (max argument count is 15). We can therefore deal
with the arbitrary amount of state to remove from the stack (lookup class, selector,
mirror receiver) and arbitrary argument orders by deferring popping anything until
we know whether the send has succeeded. So on failure we merely have to remove
the actual receiver and arguments pushed, and on success we have to slide the actual
receiver and arguments down to replace the original ones."
| arraySize performArgCount delta |
(objectMemory isArray: argumentArray) ifFalse:
[^self primitiveFailFor: PrimErrBadArgument].
"Check if number of arguments is reasonable; MaxNumArgs isn't available
so just use LargeContextSize"
arraySize := objectMemory fetchWordLengthOf: argumentArray.
+ arraySize > (LargeContextSize / objectMemory bytesPerWord) ifTrue:
- arraySize > (LargeContextSize / self bytesPerWord) ifTrue:
[^self primitiveFailFor: PrimErrBadNumArgs].
performArgCount := argumentCount.
"Push newMethod to save it in case of failure,
then push the actual receiver and args out of the array."
self push: newMethod.
self push: actualReceiver.
"Copy the arguments to the stack, and execute"
1 to: arraySize do:
[:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)].
argumentCount := arraySize.
messageSelector := selector.
+ self sendBreak: messageSelector + objectMemory baseHeaderSize
- self sendBreak: messageSelector + self baseHeaderSize
point: (objectMemory lengthOf: messageSelector)
receiver: actualReceiver.
self findNewMethodInClass: lookupClass.
"Only test CompiledMethods for argument count - any other objects playacting as CMs will have to take their chances"
((objectMemory isOopCompiledMethod: newMethod)
and: [(self argumentCountOf: newMethod) ~= argumentCount]) ifTrue:
["Restore the state by popping all those array entries and pushing back the selector and array, and fail"
self pop: arraySize + 1.
newMethod := self popStack.
^self primitiveFailFor: PrimErrBadNumArgs].
"Cannot fail this primitive from here-on. Slide the actual receiver and arguments down
to replace the perform arguments and saved newMethod and then execute the new
method. Use argumentCount not arraySize because an MNU may have changed it."
+ delta := objectMemory bytesPerWord * (performArgCount + 2). "+2 = receiver + saved newMethod"
+ argumentCount * objectMemory bytesPerWord to: 0 by: objectMemory bytesPerWord negated do:
- delta := self bytesPerWord * (performArgCount + 2). "+2 = receiver + saved newMethod"
- argumentCount * self bytesPerWord to: 0 by: self bytesPerWord negated do:
[:offset|
stackPages
longAt: stackPointer + offset + delta
put: (stackPages longAt: stackPointer + offset)].
self pop: performArgCount + 2.
self executeNewMethod.
self initPrimCall. "Recursive xeq affects primErrorCode"
^nil!
Item was changed:
----- Method: StackInterpreter>>printFrame:WithSP: (in category 'debug printing') -----
printFrame: theFP WithSP: theSP
| theMethod numArgs topThing |
<inline: false>
<var: #theFP type: #'char *'>
<var: #theSP type: #'char *'>
<var: #addr type: #'char *'>
self cCode: '' inSmalltalk: [self transcript ensureCr].
theMethod := self frameMethod: theFP.
numArgs := self frameNumArgs: theFP.
self shortPrintFrame: theFP.
self printFrameOop: 'rcvr/clsr'
+ at: theFP + FoxCallerSavedIP + ((numArgs + 1) * objectMemory bytesPerWord).
- at: theFP + FoxCallerSavedIP + ((numArgs + 1) * self bytesPerWord).
numArgs to: 1 by: -1 do:
+ [:i| self printFrameOop: 'arg' at: theFP + FoxCallerSavedIP + (i * objectMemory bytesPerWord)].
- [:i| self printFrameOop: 'arg' at: theFP + FoxCallerSavedIP + (i * self bytesPerWord)].
self printFrameThing: 'cllr ip/ctxt' at: theFP + FoxCallerSavedIP.
self printFrameThing: 'saved fp' at: theFP + FoxSavedFP.
self printFrameOop: 'method' at: theFP + FoxMethod.
self printFrameFlagsForFP: theFP.
self printFrameThing: 'context' at: theFP + FoxThisContext.
self printFrameOop: 'receiver' at: theFP + FoxReceiver.
topThing := stackPages longAt: theSP.
(topThing >= theMethod
and: [topThing <= (theMethod + (objectMemory sizeBitsOfSafe: theMethod))])
ifTrue:
+ [theFP + FoxReceiver - objectMemory bytesPerWord to: theSP + objectMemory bytesPerWord by: objectMemory bytesPerWord negated do:
- [theFP + FoxReceiver - self bytesPerWord to: theSP + self bytesPerWord by: self bytesPerWord negated do:
[:addr|
self printFrameOop: 'temp/stck' at: addr].
self printFrameThing: 'frame ip' at: theSP]
ifFalse:
+ [theFP + FoxReceiver - objectMemory bytesPerWord to: theSP by: objectMemory bytesPerWord negated do:
- [theFP + FoxReceiver - self bytesPerWord to: theSP by: self bytesPerWord negated do:
[:addr|
self printFrameOop: 'temp/stck' at: addr]]!
Item was changed:
----- Method: StackInterpreter>>printNameOfClass:count: (in category 'debug printing') -----
printNameOfClass: classOop count: cnt
"Details: The count argument is used to avoid a possible infinite recursion if classOop is a corrupted object."
<inline: false>
(classOop = 0 or: [cnt <= 0]) ifTrue: [^self print: 'bad class'].
((objectMemory sizeBitsOf: classOop) = metaclassSizeBytes
+ and: [metaclassSizeBytes > (thisClassIndex * objectMemory bytesPerWord)]) "(Metaclass instSize * 4)"
- and: [metaclassSizeBytes > (thisClassIndex * self bytesPerWord)]) "(Metaclass instSize * 4)"
ifTrue: [self printNameOfClass: (objectMemory fetchPointer: thisClassIndex ofObject: classOop) count: cnt - 1.
self print: ' class']
ifFalse: [self printStringOf: (objectMemory fetchPointer: classNameIndex ofObject: classOop)]!
Item was changed:
----- Method: StackInterpreter>>printOop: (in category 'debug printing') -----
printOop: oop
| cls fmt lastIndex startIP bytecodesPerLine |
<inline: false>
self printHex: oop.
(objectMemory isIntegerObject: oop) ifTrue:
[^self
cCode: 'printf("=%ld\n", integerValueOf(oop))'
inSmalltalk: [self print: (self shortPrint: oop); cr]].
(oop between: objectMemory startOfMemory and: objectMemory freeStart) ifFalse:
[self printHex: oop; print: ' is not on the heap'; cr.
^nil].
+ (oop bitAnd: (objectMemory bytesPerWord - 1)) ~= 0 ifTrue:
- (oop bitAnd: (self bytesPerWord - 1)) ~= 0 ifTrue:
[self printHex: oop; print: ' is misaligned'; cr.
^nil].
(objectMemory isFreeObject: oop) ifTrue:
[self print: ' free chunk of size '; printNum: (objectMemory sizeOfFree: oop); cr.
^nil].
self print: ': a(n) '.
self printNameOfClass: (cls := objectMemory fetchClassOfNonInt: oop) count: 5.
cls = (objectMemory splObj: ClassFloat) ifTrue:
[self cr; printFloat: (self dbgFloatValueOf: oop); cr.
^nil].
fmt := objectMemory formatOf: oop.
fmt > 4 ifTrue:
[self print: ' nbytes '; printNum: (objectMemory byteSizeOf: oop)].
self cr.
(fmt > 4 and: [fmt < 12]) ifTrue:
["This will answer false if splObj: ClassAlien is nilObject"
(self is: oop KindOfClass: (objectMemory splObj: ClassAlien)) ifTrue:
[self print: ' datasize '; printNum: (self sizeOfAlienData: oop).
self print: ((self isIndirectAlien: oop)
ifTrue: [' indirect @ ']
ifFalse:
[(self isPointerAlien: oop)
ifTrue: [' pointer @ ']
ifFalse: [' direct @ ']]).
self printHex: (self startOfAlienData: oop); cr.
^nil].
(objectMemory isWords: oop) ifTrue:
+ [lastIndex := 64 min: ((objectMemory byteSizeOf: oop) / objectMemory bytesPerWord).
- [lastIndex := 64 min: ((objectMemory byteSizeOf: oop) / self bytesPerWord).
lastIndex > 0 ifTrue:
[1 to: lastIndex do:
[:index|
self space; printHex: (objectMemory fetchLong32: index - 1 ofObject: oop).
(index \\ self elementsPerPrintOopLine) = 0 ifTrue:
[self cr]].
(lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse:
[self cr]].
^nil].
^self printStringOf: oop; cr].
+ lastIndex := 64 min: (startIP := (objectMemory lastPointerOf: oop) / objectMemory bytesPerWord).
- lastIndex := 64 min: (startIP := (objectMemory lastPointerOf: oop) / self bytesPerWord).
lastIndex > 0 ifTrue:
[1 to: lastIndex do:
[:index|
self cCode: 'printHex(fetchPointerofObject(index - 1, oop)); putchar('' '')'
inSmalltalk: [self space; printHex: (objectMemory fetchPointer: index - 1 ofObject: oop); space.
self print: (self shortPrint: (objectMemory fetchPointer: index - 1 ofObject: oop))].
(index \\ self elementsPerPrintOopLine) = 0 ifTrue:
[self cr]].
(lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse:
[self cr]].
(objectMemory isCompiledMethod: oop)
ifFalse:
[startIP > 64 ifTrue: [self print: '...'; cr]]
ifTrue:
+ [startIP := startIP * objectMemory bytesPerWord + 1.
- [startIP := startIP * self bytesPerWord + 1.
lastIndex := objectMemory lengthOf: oop.
lastIndex - startIP > 100 ifTrue:
[lastIndex := startIP + 100].
bytecodesPerLine := 10.
startIP to: lastIndex do:
[:index| | byte |
byte := objectMemory fetchByte: index - 1 ofObject: oop.
self cCode: 'printf(" %02x/%-3d", byte,byte)'
inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte].
((index - startIP + 1) \\ bytecodesPerLine) = 0 ifTrue:
[self cr]].
((lastIndex - startIP + 1) \\ bytecodesPerLine) = 0 ifFalse:
[self cr]]!
Item was changed:
----- Method: StackInterpreter>>printOopShortInner: (in category 'debug printing') -----
printOopShortInner: oop
| classOop name nameLen |
<var: #name type: #'char *'>
<inline: true>
self printChar: $=.
(objectMemory isIntegerObject: oop) ifTrue:
[self printNum: (objectMemory integerValueOf: oop);
printChar: $(;
printHex: (objectMemory integerValueOf: oop);
printChar: $).
^nil].
(oop between: objectMemory startOfMemory and: objectMemory freeStart) ifFalse:
[self printHex: oop; print: ' is not on the heap'.
^nil].
+ (oop bitAnd: (objectMemory bytesPerWord - 1)) ~= 0 ifTrue:
- (oop bitAnd: (self bytesPerWord - 1)) ~= 0 ifTrue:
[self printHex: oop; print: ' is misaligned'.
^nil].
(self isFloatObject: oop) ifTrue:
[self printFloat: (self dbgFloatValueOf: oop).
^nil].
classOop := objectMemory fetchClassOf: oop.
(objectMemory sizeBitsOf: classOop) = metaclassSizeBytes ifTrue:
[self printNameOfClass: oop count: 5.
^nil].
oop = objectMemory nilObject ifTrue: [self print: 'nil'. ^nil].
oop = objectMemory trueObject ifTrue: [self print: 'true'. ^nil].
oop = objectMemory falseObject ifTrue: [self print: 'false'. ^nil].
nameLen := self lengthOfNameOfClass: classOop.
nameLen = 0 ifTrue: [self print: 'a ??'. ^nil].
name := self nameOfClass: classOop.
nameLen = 10 ifTrue:
[(self str: name n: 'ByteString' cmp: 10) not "strncmp is weird" ifTrue:
[self printChar: $"; printStringOf: oop; printChar: $".
^nil].
(self str: name n: 'ByteSymbol' cmp: 10) not "strncmp is weird" ifTrue:
[self printChar: $#; printStringOf: oop.
^nil]].
(nameLen = 9 and: [(self str: name n: 'Character' cmp: 9) not]) ifTrue:
[self printChar: $$; printChar: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop)).
^nil].
self cCode: [self prin: 'a(n) %.*s' t: nameLen f: name]
inSmalltalk: [self print: 'a(n) '; print: name]!
Item was changed:
----- Method: StackInterpreter>>printStringOf: (in category 'debug printing') -----
printStringOf: oop
| fmt cnt i |
<inline: false>
(objectMemory isIntegerObject: oop) ifTrue:
[^nil].
(oop between: objectMemory startOfMemory and: objectMemory freeStart) ifFalse:
[^nil].
+ (oop bitAnd: (objectMemory bytesPerWord - 1)) ~= 0 ifTrue:
- (oop bitAnd: (self bytesPerWord - 1)) ~= 0 ifTrue:
[^nil].
fmt := objectMemory formatOf: oop.
fmt < 8 ifTrue: [ ^nil ].
cnt := 100 min: (objectMemory lengthOf: oop).
i := 0.
((objectMemory is: oop
instanceOf: (objectMemory splObj: ClassByteArray)
compactClassIndex: classByteArrayCompactIndex)
or: [(objectMemory is: oop
instanceOf: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex)
or: [(objectMemory is: oop
instanceOf: (objectMemory splObj: ClassLargeNegativeInteger)
compactClassIndex: ClassLargeNegativeIntegerCompactIndex)]])
ifTrue:
[[i < cnt] whileTrue: [
self printHex: (objectMemory fetchByte: i ofObject: oop).
i := i + 1]]
ifFalse:
[[i < cnt] whileTrue: [
self printChar: (objectMemory fetchByte: i ofObject: oop).
i := i + 1]].
self flush!
Item was changed:
----- Method: StackInterpreter>>push: (in category 'internal interpreter access') -----
push: object
"In the StackInterpreter stacks grow down."
| sp |
<inline: true>
<var: #sp type: #'char *'>
+ stackPages longAt: (sp := stackPointer - objectMemory bytesPerWord) put: object.
- stackPages longAt: (sp := stackPointer - self bytesPerWord) put: object.
stackPointer := sp!
Item was changed:
----- Method: StackInterpreter>>pushClosureCopyCopiedValuesBytecode (in category 'stack bytecodes') -----
pushClosureCopyCopiedValuesBytecode
"The compiler has pushed the values to be copied, if any. Find numArgs and numCopied in the byte following.
Create a Closure with space for the copiedValues and pop numCopied values off the stack into the closure.
Set numArgs as specified, and set startpc to the pc following the block size and jump over that code."
| newClosure numArgsNumCopied numArgs numCopied blockSize context |
numArgsNumCopied := self fetchByte.
numArgs := numArgsNumCopied bitAnd: 16rF.
numCopied := numArgsNumCopied bitShift: -4.
"Split blockSize := (self fetchByte * 256) + self fetchByte. into two because evaluation order in C is undefined."
blockSize := self fetchByte << 8.
blockSize := blockSize + self fetchByte.
"No need to record the pushed copied values in the outerContext."
+ context := self ensureFrameIsMarried: localFP SP: localSP + (numCopied * objectMemory bytesPerWord).
- context := self ensureFrameIsMarried: localFP SP: localSP + (numCopied * self bytesPerWord).
newClosure := self
closureIn: context
numArgs: numArgs
+ instructionPointer: (self oopForPointer: localIP) + 2 - (method+objectMemory baseHeaderSize)
- instructionPointer: (self oopForPointer: localIP) + 2 - (method+self baseHeaderSize)
numCopiedValues: numCopied.
numCopied > 0 ifTrue:
[0 to: numCopied - 1 do:
[:i|
"Assume: have just allocated a new BlockClosure; it must be young.
Thus, can use unchecked stores."
objectMemory storePointerUnchecked: i + ClosureFirstCopiedValueIndex
ofObject: newClosure
withValue: (self internalStackValue: numCopied - i - 1)].
self internalPop: numCopied].
localIP := localIP + blockSize.
self fetchNextBytecode.
self internalPush: newClosure!
Item was changed:
----- Method: StackInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') -----
readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset
"Read an image from the given file stream, allocating the given amount of memory to its object heap. Fail if the image has an unknown format or requires more than the given amount of memory."
"Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command."
"This code is based on C code by Ian Piumarta and Smalltalk code by Tim Rowledge. Many thanks to both of you!!!!"
| swapBytes headerStart headerSize dataSize oldBaseAddr hdrNumStackPages
minimumMemory memStart bytesRead bytesToShift heapSize hdrEdenBytes
headerFlags hdrMaxExtSemTabSize |
<var: #f type: 'sqImageFile '>
<var: #memStart type: 'usqInt'>
<var: #desiredHeapSize type: 'usqInt'>
<var: #headerStart type: 'squeakFileOffsetType '>
<var: #dataSize type: 'size_t '>
<var: #imageOffset type: 'squeakFileOffsetType '>
+ metaclassSizeBytes := 6 * objectMemory bytesPerWord. "guess (Metaclass instSize * BPW)"
- metaclassSizeBytes := 6 * self bytesPerWord. "guess (Metaclass instSize * BPW)"
swapBytes := self checkImageVersionFrom: f startingAt: imageOffset.
+ headerStart := (self sqImageFilePosition: f) - objectMemory bytesPerWord. "record header start position"
- headerStart := (self sqImageFilePosition: f) - self bytesPerWord. "record header start position"
headerSize := self getLongFromFile: f swap: swapBytes.
dataSize := self getLongFromFile: f swap: swapBytes.
oldBaseAddr := self getLongFromFile: f swap: swapBytes.
objectMemory setSpecialObjectsOop: (self getLongFromFile: f swap: swapBytes).
objectMemory setLastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used."
savedWindowSize := self getLongFromFile: f swap: swapBytes.
headerFlags := self getLongFromFile: f swap: swapBytes.
self setImageHeaderFlagsFrom: headerFlags.
extraVMMemory := self getLongFromFile: f swap: swapBytes.
hdrNumStackPages := self getShortFromFile: f swap: swapBytes.
"4 stack pages is small. Should be able to run with as few as
three. 4 should be comfortable but slow. 8 is a reasonable
default. Can be changed via vmParameterAt: 43 put: n.
Can be set as a preference (Info.plist, VM.ini, command line etc).
If desiredNumStackPages is already non-zero then it has been
set as a preference. Ignore (but preserve) the header's default."
numStackPages := desiredNumStackPages ~= 0
ifTrue: [desiredNumStackPages]
ifFalse: [hdrNumStackPages = 0
ifTrue: [self defaultNumStackPages]
ifFalse: [hdrNumStackPages]].
desiredNumStackPages := hdrNumStackPages.
"pad to word boundary. This slot can be used for anything else that will fit in 16 bits.
Preserve it to be polite to images run on Cog."
theUnknownShort := self getShortFromFile: f swap: swapBytes.
hdrEdenBytes := self getLongFromFile: f swap: swapBytes.
objectMemory setEdenBytes: (desiredEdenBytes ~= 0
ifTrue: [desiredEdenBytes]
ifFalse:
[hdrEdenBytes = 0
ifTrue: [objectMemory defaultEdenBytes]
ifFalse: [hdrEdenBytes]]).
desiredEdenBytes := hdrEdenBytes.
hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes.
hdrMaxExtSemTabSize ~= 0 ifTrue:
[self setMaxExtSemSizeTo: hdrMaxExtSemTabSize].
"decrease Squeak object heap to leave extra memory for the VM"
heapSize := self cCode: 'reserveExtraCHeapBytes(desiredHeapSize, extraVMMemory)'.
"compare memory requirements with availability".
minimumMemory := dataSize + objectMemory edenBytes + self interpreterAllocationReserveBytes.
heapSize < minimumMemory ifTrue:
[self insufficientMemorySpecifiedError].
"allocate a contiguous block of memory for the Squeak heap"
objectMemory setMemory: (self cCode: 'sqAllocateMemory(minimumMemory, heapSize)').
objectMemory getMemory = nil ifTrue: [self insufficientMemoryAvailableError].
memStart := objectMemory startOfMemory.
objectMemory setMemoryLimit: (memStart + heapSize) - 24. "decrease memoryLimit a tad for safety"
objectMemory setEndOfMemory: memStart + dataSize.
"position file after the header"
self sqImageFile: f Seek: headerStart + headerSize.
"read in the image in bulk, then swap the bytes if necessary"
bytesRead := self cCode: 'sqImageFileRead(pointerForOop(memory), sizeof(unsigned char), dataSize, f)'.
bytesRead ~= dataSize ifTrue: [self unableToReadImageError].
self ensureImageFormatIsUpToDate: swapBytes.
"compute difference between old and new memory base addresses"
bytesToShift := memStart - oldBaseAddr.
self initializeInterpreter: bytesToShift. "adjusts all oops to new location"
^dataSize
!
Item was changed:
----- Method: StackInterpreter>>reestablishContextPriorToCallback: (in category 'callback support') -----
reestablishContextPriorToCallback: callbackContext
"callbackContext is an activation of invokeCallback:[stack:registers:jmpbuf:].
Its sender is the VM's state prior to the callback. Reestablish that state,
and mark calloutContext as dead."
| calloutContext theFP thePage |
<export: true>
<var: #theFP type: #'char *'>
<var: #thePage type: #'StackPage *'>
self flag: #obsolete.
(self isLiveContext: callbackContext) ifFalse:
[^false].
calloutContext := self externalInstVar: SenderIndex ofContext: callbackContext.
(self isLiveContext: calloutContext) ifFalse:
[^false].
"Mark callbackContext as dead; the common case is that it is the current frame.
We go the extra mile for the debugger."
(self isSingleContext: callbackContext)
ifTrue: [self markContextAsDead: callbackContext]
ifFalse:
[theFP := self frameOfMarriedContext: callbackContext.
framePointer = theFP "common case"
ifTrue:
[(self isBaseFrame: theFP)
ifTrue: [stackPages freeStackPage: stackPage]
ifFalse: "calloutContext is immediately below on the same page. Make it current."
[instructionPointer := (self frameCallerSavedIP: framePointer) asUnsignedInteger.
+ stackPointer := framePointer + (self frameStackedReceiverOffset: framePointer) + objectMemory bytesPerWord.
- stackPointer := framePointer + (self frameStackedReceiverOffset: framePointer) + self bytesPerWord.
framePointer := self frameCallerFP: framePointer.
^true]]
ifFalse:
[self externalDivorceFrame: theFP andContext: callbackContext.
self markContextAsDead: callbackContext]].
"Make the calloutContext the active frame. The case where calloutContext
is immediately below callbackContext on the same page is handled above."
(self isStillMarriedContext: calloutContext)
ifTrue:
[theFP := self frameOfMarriedContext: calloutContext.
thePage := stackPages stackPageFor: theFP.
"findSPOf:on: points to the word beneath the instructionPointer, but
there is no instructionPointer on the top frame of the current page."
self assert: thePage ~= stackPage.
+ stackPointer := (self findSPOf: theFP on: thePage) - objectMemory bytesPerWord.
- stackPointer := (self findSPOf: theFP on: thePage) - self bytesPerWord.
framePointer := theFP]
ifFalse:
[thePage := self makeBaseFrameFor: calloutContext.
framePointer := thePage headFP.
stackPointer := thePage headSP].
instructionPointer := self popStack.
self setStackPageAndLimit: thePage.
^true!
Item was changed:
----- Method: StackInterpreter>>returnAs:ThroughCallback:Context: (in category 'callback support') -----
returnAs: returnTypeOop ThroughCallback: vmCallbackContext Context: callbackMethodContext
"callbackMethodContext is an activation of invokeCallback:[stack:registers:jmpbuf:].
Its sender is the VM's state prior to the callback. Reestablish that state (via longjmp),
and mark callbackMethodContext as dead."
<export: true>
<var: #vmCallbackContext type: #'VMCallbackContext *'>
| calloutMethodContext theFP thePage |
<var: #theFP type: #'char *'>
<var: #thePage type: #'StackPage *'>
((self isIntegerObject: returnTypeOop)
and: [self isLiveContext: callbackMethodContext]) ifFalse:
[^false].
calloutMethodContext := self externalInstVar: SenderIndex ofContext: callbackMethodContext.
(self isLiveContext: calloutMethodContext) ifFalse:
[^false].
"Mark callbackMethodContext as dead; the common case is that it is the current frame.
We go the extra mile for the debugger."
(self isSingleContext: callbackMethodContext)
ifTrue: [self markContextAsDead: callbackMethodContext]
ifFalse:
[theFP := self frameOfMarriedContext: callbackMethodContext.
framePointer = theFP "common case"
ifTrue:
[(self isBaseFrame: theFP)
ifTrue: [stackPages freeStackPage: stackPage]
ifFalse: "calloutMethodContext is immediately below on the same page. Make it current."
[instructionPointer := (self frameCallerSavedIP: framePointer) asUnsignedInteger.
+ stackPointer := framePointer + (self frameStackedReceiverOffset: framePointer) + objectMemory bytesPerWord.
- stackPointer := framePointer + (self frameStackedReceiverOffset: framePointer) + self bytesPerWord.
framePointer := self frameCallerFP: framePointer.
self restoreCStackStateForCallbackContext: vmCallbackContext.
"N.B. siglongjmp is defines as _longjmp on non-win32 platforms.
This matches the use of _setjmp in ia32abicc.c."
self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop).
^true]]
ifFalse:
[self externalDivorceFrame: theFP andContext: callbackMethodContext.
self markContextAsDead: callbackMethodContext]].
"Make the calloutMethodContext the active frame. The case where calloutMethodContext
is immediately below callbackMethodContext on the same page is handled above."
(self isStillMarriedContext: calloutMethodContext)
ifTrue:
[theFP := self frameOfMarriedContext: calloutMethodContext.
thePage := stackPages stackPageFor: theFP.
"findSPOf:on: points to the word beneath the instructionPointer, but
there is no instructionPointer on the top frame of the current page."
self assert: thePage ~= stackPage.
+ stackPointer := (self findSPOf: theFP on: thePage) - objectMemory bytesPerWord.
- stackPointer := (self findSPOf: theFP on: thePage) - self bytesPerWord.
framePointer := theFP]
ifFalse:
[thePage := self makeBaseFrameFor: calloutMethodContext.
framePointer := thePage headFP.
stackPointer := thePage headSP].
instructionPointer := self popStack.
self setStackPageAndLimit: thePage.
self restoreCStackStateForCallbackContext: vmCallbackContext.
"N.B. siglongjmp is defines as _longjmp on non-win32 platforms.
This matches the use of _setjmp in ia32abicc.c."
self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop).
"NOTREACHED"
^true!
Item was changed:
----- Method: StackInterpreter>>reverseDisplayFrom:to: (in category 'I/O primitive support') -----
reverseDisplayFrom: startIndex to: endIndex
"Reverse the given range of Display words (at different bit
depths, this will reverse different numbers of pixels). Used to
give feedback during VM activities such as garbage
collection when debugging. It is assumed that the given
word range falls entirely within the first line of the Display."
| displayObj displayBits w wordStartIndex wordEndIndex primFailCodeValue |
displayObj := objectMemory splObj: TheDisplay.
((objectMemory isPointers: displayObj) and: [(objectMemory lengthOf: displayObj) >= 4]) ifFalse: [^ nil].
w := objectMemory fetchPointer: 1 ofObject: displayObj.
displayBits := objectMemory fetchPointer: 0 ofObject: displayObj.
((objectMemory isIntegerObject: displayBits)
or: [(objectMemory isNonIntegerObject: w)
or: [objectMemory isPointersNonInt: displayBits]]) ifTrue: [^ nil].
wordStartIndex := startIndex * 4.
wordEndIndex := endIndex * 4 min: (objectMemory sizeBitsOf: displayBits).
+ displayBits := displayBits + objectMemory baseHeaderSize.
- displayBits := displayBits + self baseHeaderSize.
displayBits + wordStartIndex to: displayBits + wordEndIndex by: 4 do:
[:ptr | | reversed |
reversed := (objectMemory long32At: ptr) bitXor: 16rFFFFFFFF.
objectMemory longAt: ptr put: reversed].
primFailCodeValue := primFailCode.
self initPrimCall.
self displayBitsOf: displayObj Left: 0 Top: 0 Right: (objectMemory integerValueOf: w) Bottom: 1.
self ioForceDisplayUpdate.
primFailCode := primFailCodeValue!
Item was changed:
----- Method: StackInterpreter>>roomToPushNArgs: (in category 'primitive support') -----
roomToPushNArgs: n
"Answer if there is room to push n arguments onto the current stack.
There may be room in this stackPage but there may not be room if
the frame were converted into a context."
| cntxSize |
self assert: method = (stackPages longAt: framePointer + FoxMethod).
cntxSize := ((self headerOf: method) bitAnd: LargeContextBit) ~= 0
+ ifTrue: [LargeContextSize / objectMemory bytesPerWord - ReceiverIndex]
+ ifFalse: [SmallContextSize / objectMemory bytesPerWord - ReceiverIndex].
- ifTrue: [LargeContextSize / self bytesPerWord - ReceiverIndex]
- ifFalse: [SmallContextSize / self bytesPerWord - ReceiverIndex].
^self stackPointerIndex + n <= cntxSize!
Item was changed:
----- Method: StackInterpreter>>sendInvokeCallbackContext: (in category 'callback support') -----
sendInvokeCallbackContext: vmCallbackContext
"Send the calllback message to Alien class with the supplied arg(s). Use either the
1 arg invokeCallbackContext: or the 4 arg invokeCallback:stack:registers:jmpbuf:
message, depending on what selector is installed in the specialObjectsArray.
Note that if invoking the legacy invokeCallback:stack:registers:jmpbuf: we pass the
vmCallbackContext as the jmpbuf argument (see reestablishContextPriorToCallback:).
The arguments are raw C addresses and are converted to integer objects on the way."
<export: true>
<var: #vmCallbackContext type: #'VMCallbackContext *'>
lkupClass := self fetchClassOfNonInt: (self splObj: ClassAlien).
messageSelector := self splObj: SelectorInvokeCallback.
(self lookupInMethodCacheSel: messageSelector class: lkupClass) ifFalse:
[(self lookupMethodNoMNUEtcInClass: lkupClass) ~= 0 ifTrue:
[^false]].
primitiveFunctionPointer ~= 0 ifTrue:
[^false].
self saveCStackStateForCallbackContext: vmCallbackContext.
self push: (self splObj: ClassAlien). "receiver"
+ self cppIf: [objectMemory bytesPerWord = 8]
- self cppIf: [self bytesPerWord = 8]
ifTrue:
[(self argumentCountOf: newMethod) = 4 ifTrue:
[self push: (self positive64BitIntegerFor: vmCallbackContext thunkp asUnsignedInteger).
self push: (self positive64BitIntegerFor: vmCallbackContext stackp asUnsignedInteger).
self push: (self positive64BitIntegerFor: vmCallbackContext intregargsp asUnsignedInteger)].
self push: (self positive64BitIntegerFor: vmCallbackContext asUnsignedInteger)]
ifFalse:
[(self argumentCountOf: newMethod) = 4 ifTrue:
[self push: (self positive32BitIntegerFor: vmCallbackContext thunkp asUnsignedInteger).
self push: (self positive32BitIntegerFor: vmCallbackContext stackp asUnsignedInteger).
self push: (self positive32BitIntegerFor: vmCallbackContext intregargsp asUnsignedInteger)].
self push: (self positive32BitIntegerFor: vmCallbackContext asUnsignedInteger)].
self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector.
self justActivateNewMethod.
(self isMachineCodeFrame: framePointer) ifFalse:
[self maybeFlagMethodAsInterpreted: newMethod].
self externalWriteBackHeadFramePointers.
self handleStackOverflow.
self enterSmalltalkExecutiveFromCallback.
"not reached"
^true!
Item was changed:
----- Method: StackInterpreter>>sizeOfSTArrayFromCPrimitive: (in category 'utilities') -----
sizeOfSTArrayFromCPrimitive: cPtr
"Return the number of indexable fields of the given object. This method is to be called from an automatically generated C primitive. The argument is assumed to be a pointer to the first indexable field of a words or bytes object; the object header starts 4 bytes before that."
"Note: Only called by translated primitive code."
| oop |
<var: #cPtr type: 'void *'>
+ oop := (self oopForPointer: cPtr) - objectMemory baseHeaderSize.
- oop := (self oopForPointer: cPtr) - self baseHeaderSize.
(objectMemory isWordsOrBytes: oop) ifFalse: [
self primitiveFail.
^0].
^objectMemory lengthOf: oop
!
Item was changed:
----- Method: StackInterpreter>>slowPrimitiveResponse (in category 'primitive support') -----
slowPrimitiveResponse
"Called under the assumption that primFunctionPtr has been preloaded"
| nArgs savedFramePointer savedStackPointer |
<inline: true>
<asmLabel: false>
<var: #savedFramePointer type: #'char *'>
<var: #savedStackPointer type: #'char *'>
FailImbalancedPrimitives ifTrue:
[nArgs := argumentCount.
savedStackPointer := stackPointer.
savedFramePointer := framePointer].
self initPrimCall.
self dispatchFunctionPointer: primitiveFunctionPointer.
(FailImbalancedPrimitives
and: [self successful
and: [framePointer = savedFramePointer]]) ifTrue:"Don't fail if primitive has done something radical, e.g. perform:"
+ [stackPointer ~= (savedStackPointer + (nArgs * objectMemory bytesPerWord)) ifTrue:
- [stackPointer ~= (savedStackPointer + (nArgs * self bytesPerWord)) ifTrue:
[self flag: 'Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context'.
"This is necessary but insufficient; the result may still have been written to the stack.
At least we'll know something is wrong."
stackPointer := savedStackPointer.
self failUnbalancedPrimitive]].
"If we are profiling, take accurate primitive measures"
nextProfileTick > 0 ifTrue:
[self checkProfileTick: newMethod].
^self successful!
Item was changed:
----- Method: StackInterpreter>>snapshotCleanUp (in category 'image save/restore') -----
snapshotCleanUp
"Clean up right before saving an image, sweeping memory and:
* nilling out all fields of contexts above the stack pointer.
* flushing external primitives
* clearing the root bit of any object in the root table
* bereaving widowed contexts.
By ensuring that all contexts are single in a snapshot (i.e. that no married contexts
exist) we can maintain the invariant that a married or widowed context's frame
reference (in its sender field) must point into the stack pages since no married or
widowed contexts are present from older runs of the system."
| oop header fmt sz |
oop := objectMemory firstObject.
[self oop: oop isLessThan: objectMemory freeStart] whileTrue:
[(objectMemory isFreeObject: oop) ifFalse:
[header := self longAt: oop.
fmt := objectMemory formatOfHeader: header.
"Clean out context"
(fmt = 3 and: [self isContextHeader: header]) ifTrue:
["All contexts have been divorced. Bereave remaining widows."
(self isMarriedOrWidowedContext: oop) ifTrue:
[self markContextAsDead: oop].
sz := objectMemory sizeBitsOf: oop.
+ (objectMemory lastPointerOf: oop) + objectMemory bytesPerWord
+ to: sz - objectMemory baseHeaderSize by: objectMemory bytesPerWord
- (objectMemory lastPointerOf: oop) + self bytesPerWord
- to: sz - self baseHeaderSize by: self bytesPerWord
do: [:i | self longAt: oop + i put: objectMemory nilObject]].
"Clean out external functions"
fmt >= 12 ifTrue:
["This is a compiled method"
(self primitiveIndexOf: oop) = PrimitiveExternalCallIndex ifTrue:
["Its primitiveExternalCall"
self flushExternalPrimitiveOf: oop]]].
oop := objectMemory objectAfter: oop].
objectMemory clearRootsTable!
Item was changed:
----- Method: StackInterpreter>>stackFloatValue: (in category 'internal interpreter access') -----
stackFloatValue: offset
"In the StackInterpreter stacks grow down."
| result floatPointer |
<returnTypeC: #double>
<var: #result type: #double>
+ floatPointer := stackPages longAt: stackPointer + (offset * objectMemory bytesPerWord).
- floatPointer := stackPages longAt: stackPointer + (offset * self bytesPerWord).
"N.B. Because Slang always inlines assertClassOf:is:compactClassIndex:
(because assertClassOf:is:compactClassIndex: has an inline: pragma) the
phrase (self splObj: ClassArray) is expanded in-place and is _not_
evaluated if ClassArrayCompactIndex is non-zero."
self assertClassOf: floatPointer
is: (objectMemory splObj: ClassFloat)
compactClassIndex: ClassFloatCompactIndex.
self successful ifTrue:
[self cCode: '' inSmalltalk: [result := Float new: 2].
+ objectMemory fetchFloatAt: floatPointer + objectMemory baseHeaderSize into: result.
- objectMemory fetchFloatAt: floatPointer + self baseHeaderSize into: result.
^result].
^0.0!
Item was changed:
----- Method: StackInterpreter>>stackLimitOffset (in category 'stack pages') -----
stackLimitOffset
"Answer the amount of slots needed to fit a new frame at the point the stack
limit is checked. A frame looks like this at the point the stack limit is checked:
stacked receiver/closure
arg0
...
argN
caller's method ip/base frame's sender context
fp-> saved fp
method
method header fields
context (uninitialized)
receiver
first temp
...
sp-> Nth temp
So the amount of headroom is
the maximum number of arguments + 1 (for stacked receiver and arguments)
+ the frame size
+ the max number of temps.
Since a method's number of temps includes its arguments the actual offset is:"
+ ^(FrameSlots + 64) * objectMemory bytesPerWord!
- ^(FrameSlots + 64) * self bytesPerWord!
Item was changed:
----- Method: StackInterpreter>>stackPositiveMachineIntegerValue: (in category 'internal interpreter access') -----
stackPositiveMachineIntegerValue: offset
<api>
"In the StackInterpreter stacks grow down."
| integerPointer |
+ integerPointer := stackPages longAt: stackPointer + (offset * objectMemory bytesPerWord).
- integerPointer := stackPages longAt: stackPointer + (offset * self bytesPerWord).
^self positiveMachineIntegerValueOf: integerPointer!
Item was changed:
----- Method: StackInterpreter>>stackSignedMachineIntegerValue: (in category 'internal interpreter access') -----
stackSignedMachineIntegerValue: offset
<api>
"In the StackInterpreter stacks grow down."
| integerPointer |
+ integerPointer := stackPages longAt: stackPointer + (offset * objectMemory bytesPerWord).
- integerPointer := stackPages longAt: stackPointer + (offset * self bytesPerWord).
^self signedMachineIntegerValueOf: integerPointer!
Item was changed:
----- Method: StackInterpreter>>stackValue: (in category 'internal interpreter access') -----
stackValue: offset
<api>
"In the StackInterpreter stacks grow down."
+ ^stackPages longAt: stackPointer + (offset * objectMemory bytesPerWord)!
- ^stackPages longAt: stackPointer + (offset * self bytesPerWord)!
Item was changed:
----- Method: StackInterpreter>>stackValue:put: (in category 'internal interpreter access') -----
stackValue: offset put: oop
"In the StackInterpreter stacks grow down."
^stackPages
+ longAt: stackPointer + (offset * objectMemory bytesPerWord)
- longAt: stackPointer + (offset * self bytesPerWord)
put: oop!
Item was changed:
----- Method: StackInterpreter>>sufficientSpaceToInstantiate:indexableSize: (in category 'object access primitives') -----
sufficientSpaceToInstantiate: classOop indexableSize: size
"Return the number of bytes required to allocate an instance of the given class with the given number of indexable fields."
"Details: For speed, over-estimate space needed for fixed fields or literals; the low space threshold is a blurry line."
| format atomSize|
<inline: true>
format := self instSpecOfClass: classOop.
"fail if attempting to call new: on non-indexable class"
((self cCoerce: size to: 'usqInt ') > 0 and: [format < 2])
ifTrue: [^ false].
format < 8
+ ifTrue: ["indexable fields are words or pointers" atomSize := objectMemory bytesPerWord]
- ifTrue: ["indexable fields are words or pointers" atomSize := self bytesPerWord]
ifFalse: ["indexable fields are bytes" atomSize := 1].
^objectMemory sufficientSpaceToAllocate: 2500 + (size * atomSize)!
Item was changed:
----- Method: StackInterpreter>>temporary:in: (in category 'internal interpreter access') -----
temporary: offset in: theFP
"See StackInterpreter class>>initializeFrameIndices"
| frameNumArgs |
<inline: true>
<var: #theFP type: #'char *'>
^offset < (frameNumArgs := self frameNumArgs: theFP)
+ ifTrue: [stackPages longAt: theFP + FoxCallerSavedIP + ((frameNumArgs - offset) * objectMemory bytesPerWord)]
- ifTrue: [stackPages longAt: theFP + FoxCallerSavedIP + ((frameNumArgs - offset) * self bytesPerWord)]
ifFalse: [stackPages longAt: theFP + FoxReceiver - self bytesPerWord + ((frameNumArgs - offset) * self bytesPerWord)]!
Item was changed:
----- Method: StackInterpreter>>temporary:in:put: (in category 'internal interpreter access') -----
temporary: offset in: theFP put: valueOop
"See StackInterpreter class>>initializeFrameIndices"
| frameNumArgs |
<inline: true>
<var: #theFP type: #'char *'>
offset < (frameNumArgs := self frameNumArgs: theFP)
+ ifTrue: [stackPages longAt: theFP + FoxCallerSavedIP + ((frameNumArgs - offset) * objectMemory bytesPerWord) put: valueOop]
- ifTrue: [stackPages longAt: theFP + FoxCallerSavedIP + ((frameNumArgs - offset) * self bytesPerWord) put: valueOop]
ifFalse: [stackPages longAt: theFP + FoxReceiver - self bytesPerWord + ((frameNumArgs - offset) * self bytesPerWord) put: valueOop]!
Item was changed:
----- Method: StackInterpreter>>temporaryLocation:in:numArgs: (in category 'internal interpreter access') -----
temporaryLocation: offset in: theFP numArgs: numArgs
"Answer the pointer to a given temporary (for debug frame printing in odd circumstances)"
<var: #theFP type: #'char *'>
<returnTypeC: #'char *'>
<asmLabel: false>
^offset < numArgs
+ ifTrue: [theFP + FoxCallerSavedIP + ((numArgs - offset) * objectMemory bytesPerWord)]
- ifTrue: [theFP + FoxCallerSavedIP + ((numArgs - offset) * self bytesPerWord)]
ifFalse: [theFP + FoxReceiver - self bytesPerWord + ((numArgs - offset) * self bytesPerWord)]!
Item was changed:
----- Method: StackInterpreter>>unPop: (in category 'internal interpreter access') -----
unPop: nItems
"In the StackInterpreter stacks grow down."
+ stackPointer := stackPointer - (nItems * objectMemory bytesPerWord)!
- stackPointer := stackPointer - (nItems * self bytesPerWord)!
Item was changed:
----- Method: StackInterpreter>>updateObjectsPostByteSwapFrom:to: (in category 'image save/restore') -----
updateObjectsPostByteSwapFrom: startOop to: stopAddr
"Byte-swap the words of all bytes objects in a range of the
image, including Strings, ByteArrays, and CompiledMethods.
This returns these objects to their original byte ordering
after blindly byte-swapping the entire image. For compiled
methods, byte-swap only their bytecodes part.
Ensure floats are in platform-order."
| oop fmt wordAddr methodHeader swapFloatWords temp |
swapFloatWords := objectMemory vmEndianness ~= imageFloatsBigEndian.
self assert: ClassFloatCompactIndex ~= 0.
oop := startOop.
[self oop: oop isLessThan: stopAddr] whileTrue:
[(objectMemory isFreeObject: oop) ifFalse:
[fmt := objectMemory formatOf: oop.
fmt >= 8 ifTrue: "oop contains bytes"
+ [wordAddr := oop + objectMemory baseHeaderSize.
- [wordAddr := oop + self baseHeaderSize.
fmt >= 12 ifTrue: "compiled method; start after methodHeader and literals"
+ [methodHeader := self longAt: oop + objectMemory baseHeaderSize.
+ wordAddr := wordAddr + objectMemory bytesPerWord + ((methodHeader >> 10 bitAnd: 255) * objectMemory bytesPerWord)].
- [methodHeader := self longAt: oop + self baseHeaderSize.
- wordAddr := wordAddr + self bytesPerWord + ((methodHeader >> 10 bitAnd: 255) * self bytesPerWord)].
objectMemory reverseBytesFrom: wordAddr to: oop + (objectMemory sizeBitsOf: oop)].
fmt = 6 ifTrue: "Bitmap, Float etc"
[(swapFloatWords
and: [(objectMemory compactClassIndexOf: oop) = ClassFloatCompactIndex])
ifTrue:
+ [temp := self longAt: oop + objectMemory baseHeaderSize.
+ self longAt: oop + objectMemory baseHeaderSize put: (self longAt: oop + objectMemory baseHeaderSize + 4).
+ self longAt: oop + objectMemory baseHeaderSize + 4 put: temp]
- [temp := self longAt: oop + self baseHeaderSize.
- self longAt: oop + self baseHeaderSize put: (self longAt: oop + self baseHeaderSize + 4).
- self longAt: oop + self baseHeaderSize + 4 put: temp]
ifFalse:
+ [objectMemory bytesPerWord = 8 ifTrue: "Object contains 32-bit half-words packed into 64-bit machine words."
+ [wordAddr := oop + objectMemory baseHeaderSize.
- [self bytesPerWord = 8 ifTrue: "Object contains 32-bit half-words packed into 64-bit machine words."
- [wordAddr := oop + self baseHeaderSize.
objectMemory reverseWordsFrom: wordAddr to: oop + (objectMemory sizeBitsOf: oop)]]]].
oop := objectMemory objectAfter: oop]!
Item was changed:
----- Method: StackInterpreter>>updateStateOfSpouseContextForFrame:WithSP: (in category 'frame access') -----
updateStateOfSpouseContextForFrame: theFP WithSP: theSP
"Update the frame's spouse context with the frame's current state except for the
sender and instruction pointer, which are used to mark the context as married."
| theContext tempIndex pointer |
<inline: false>
<var: #theFP type: #'char *'>
<var: #theSP type: #'char *'>
<var: #pointer type: #'char *'>
self assert: (self frameHasContext: theFP).
theContext := self frameContext: theFP.
self assert: (self frameReceiver: theFP)
= (objectMemory fetchPointer: ReceiverIndex ofObject: theContext).
tempIndex := self frameNumArgs: theFP.
+ pointer := theFP + FoxReceiver - objectMemory bytesPerWord.
- pointer := theFP + FoxReceiver - self bytesPerWord.
[pointer >= theSP] whileTrue:
[self assert: (objectMemory addressCouldBeOop: (stackPages longAt: pointer)).
tempIndex := tempIndex + 1.
objectMemory storePointer: ReceiverIndex + tempIndex
ofObject: theContext
withValue: (stackPages longAt: pointer).
+ pointer := pointer - objectMemory bytesPerWord].
- pointer := pointer - self bytesPerWord].
self assert: ReceiverIndex + tempIndex < (objectMemory lengthOf: theContext).
objectMemory storePointerUnchecked: StackPointerIndex
ofObject: theContext
withValue: (objectMemory integerObjectOf: tempIndex)!
Item was changed:
----- Method: StackInterpreter>>validInstructionPointer:inMethod:framePointer: (in category 'debug support') -----
validInstructionPointer: instrPointer inMethod: aMethod framePointer: fp
<var: #instrPointer type: #usqInt>
<var: #aMethod type: #usqInt>
^instrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + self bytesPerWord - 1)
+ and: [instrPointer < (aMethod + (objectMemory byteLengthOf: aMethod) + objectMemory baseHeaderSize)]!
- and: [instrPointer < (aMethod + (objectMemory byteLengthOf: aMethod) + self baseHeaderSize)]!
Item was changed:
----- Method: StackInterpreter>>withSmallIntegerTags: (in category 'frame access') -----
withSmallIntegerTags: value
<inline: true>
<var: #value type: #'char *'>
+ self assert: ((self oopForPointer: value) bitAnd: objectMemory bytesPerWord - 1) = 0.
- self assert: ((self oopForPointer: value) bitAnd: self bytesPerWord - 1) = 0.
^(self oopForPointer: value) + 1!
Item was changed:
----- Method: StackInterpreterPrimitives>>primitiveClosureCopyWithCopiedValues (in category 'control primitives') -----
primitiveClosureCopyWithCopiedValues
| newClosure numArgs |
numArgs := self stackIntegerValue: 1.
self successful ifFalse:
[^self primitiveFail].
newClosure := self
closureIn: (self stackValue: 2)
numArgs: numArgs
"greater by 1 due to preIncrement of localIP"
+ instructionPointer: instructionPointer + 2 - (method + objectMemory baseHeaderSize)
- instructionPointer: instructionPointer + 2 - (method + self baseHeaderSize)
copiedValues: self stackTop.
self pop: 3 thenPush: newClosure!
Item was changed:
----- Method: StackInterpreterPrimitives>>primitiveDoNamedPrimitiveWithArgs (in category 'plugin primitives') -----
primitiveDoNamedPrimitiveWithArgs
"Simulate an primitiveExternalCall invocation (e.g. for the Debugger). Do not cache anything.
e.g. ContextPart>>tryNamedPrimitiveIn: aCompiledMethod for: aReceiver withArgs: arguments"
| argumentArray arraySize methodArg methodHeader
moduleName functionName moduleLength functionLength
spec addr primRcvr ctxtRcvr |
<var: #addr declareC: 'void (*addr)()'>
argumentArray := self stackTop.
(objectMemory isArray: argumentArray) ifFalse:
[^self primitiveFailFor: -2]. "invalid args"
arraySize := objectMemory fetchWordLengthOf: argumentArray.
self success: (self roomToPushNArgs: arraySize).
methodArg := self stackObjectValue: 2.
self successful ifFalse:
[^self primitiveFailFor: -2]. "invalid args"
(objectMemory isOopCompiledMethod: methodArg) ifFalse:
[^self primitiveFailFor: -2]. "invalid args"
methodHeader := self headerOf: methodArg.
(self literalCountOfHeader: methodHeader) > 2 ifFalse:
[^self primitiveFailFor: -3]. "invalid methodArg state"
(self assertClassOf: (spec := objectMemory fetchPointer: 1 "first literal" ofObject: methodArg)
is: (objectMemory splObj: ClassArray)
compactClassIndex: ClassArrayCompactIndex).
(self successful
and: [(objectMemory lengthOf: spec) = 4
and: [(self primitiveIndexOfMethodHeader: methodHeader) = 117]]) ifFalse:
[^self primitiveFailFor: -3]. "invalid methodArg state"
(self argumentCountOfMethodHeader: methodHeader) = arraySize ifFalse:
[^self primitiveFailFor: -2]. "invalid args (Array args wrong size)"
"The function has not been loaded yet. Fetch module and function name."
moduleName := objectMemory fetchPointer: 0 ofObject: spec.
moduleName = objectMemory nilObject
ifTrue: [moduleLength := 0]
ifFalse: [self success: (objectMemory isBytes: moduleName).
moduleLength := objectMemory lengthOf: moduleName.
self cCode: '' inSmalltalk:
[ (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: (self stringOf: moduleName)) "??"
ifTrue: [moduleLength := 0 "Cause all of these to fail"]]].
functionName := objectMemory fetchPointer: 1 ofObject: spec.
self success: (objectMemory isBytes: functionName).
functionLength := objectMemory lengthOf: functionName.
self successful ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state"
+ addr := self ioLoadExternalFunction: functionName + objectMemory baseHeaderSize
- addr := self ioLoadExternalFunction: functionName + self baseHeaderSize
OfLength: functionLength
+ FromModule: moduleName + objectMemory baseHeaderSize
- FromModule: moduleName + self baseHeaderSize
OfLength: moduleLength.
addr = 0 ifTrue:
[^self primitiveFailFor: -1]. "could not find function; answer generic failure (see below)"
"Cannot fail this primitive from now on. Can only fail the external primitive."
objectMemory pushRemappableOop: (argumentArray := self popStack).
objectMemory pushRemappableOop: (primRcvr := self popStack).
objectMemory pushRemappableOop: self popStack. "the method"
objectMemory pushRemappableOop: self popStack. "the context receiver"
self push: primRcvr. "replace context receiver with actual receiver"
argumentCount := arraySize.
1 to: arraySize do:
[:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)].
"Run the primitive (sets primFailCode)"
lkupClass := objectMemory nilObject.
self callExternalPrimitive: addr.
ctxtRcvr := objectMemory popRemappableOop.
methodArg := objectMemory popRemappableOop.
primRcvr := objectMemory popRemappableOop.
argumentArray := objectMemory popRemappableOop.
self successful ifFalse: "If primitive failed, then restore state for failure code"
[self pop: arraySize + 1.
self push: ctxtRcvr.
self push: methodArg.
self push: primRcvr.
self push: argumentArray.
argumentCount := 3.
"Hack. A nil prim error code (primErrorCode = 1) is interpreted by the image
as meaning this primitive is not implemented. So to pass back nil as an error
code we use -1 to indicate generic failure."
primFailCode = 1 ifTrue:
[primFailCode := -1]]!
Item was changed:
----- Method: StackInterpreterPrimitives>>primitiveExternalCall (in category 'plugin primitives') -----
primitiveExternalCall
"Call an external primitive. External primitive methods first literals are an array of
* The module name (String | Symbol)
* The function name (String | Symbol)
* The session ID (SmallInteger) [OBSOLETE]
* The function index (Integer) in the externalPrimitiveTable
For fast interpreter dispatch in subsequent invocations the primitiveFunctionPointer
in the method cache is rewritten, either to the function itself, or to zero if the external
function is not found. This allows for fast responses as long as the method stays in
the cache. The cache rewrite relies on lastMethodCacheProbeWrite which is set in
addNewMethodToCache:.
Now that the VM flushes function addresses from its tables, the session ID is obsolete,
but it is kept for backward compatibility. Also, a failed lookup is reported specially. If a
method has been looked up and not been found, the function address is stored as -1
(i.e., the SmallInteger -1 to distinguish from 16rFFFFFFFF which may be returned from
lookup), and the primitive fails with PrimErrNotFound."
| lit addr moduleName functionName moduleLength functionLength index |
<var: #addr declareC: 'void (*addr)()'>
"Fetch the first literal of the method"
(self literalCountOf: newMethod) > 0 ifFalse:
[^self primitiveFailFor: PrimErrBadMethod].
lit := self literal: 0 ofMethod: newMethod.
"Check if it's an array of length 4"
((objectMemory isArray: lit) and: [(objectMemory lengthOf: lit) = 4]) ifFalse:
[^self primitiveFailFor: PrimErrBadMethod].
"Look at the function index in case it has been loaded before"
index := objectMemory fetchPointer: 3 ofObject: lit.
(objectMemory isIntegerObject: index) ifFalse:
[^self primitiveFailFor: PrimErrBadMethod].
index := objectMemory integerValueOf: index.
"Check if we have already looked up the function and failed."
index < 0 ifTrue:
["Function address was not found in this session,
Void the primitive function."
self rewriteMethodCacheEntryForExternalPrimitiveToFunction: 0.
^self primitiveFailFor: PrimErrNotFound].
"Try to call the function directly"
(index > 0 and: [index <= MaxExternalPrimitiveTableSize]) ifTrue:
[addr := externalPrimitiveTable at: index - 1.
addr ~= 0 ifTrue:
[self rewriteMethodCacheEntryForExternalPrimitiveToFunction: (self cCode: 'addr' inSmalltalk: [1000 + index]).
self callExternalPrimitive: addr.
^nil].
"if we get here, then an index to the external prim was
kept on the ST side although the underlying prim
table was already flushed"
^self primitiveFailFor: PrimErrNamedInternal].
"Clean up session id and external primitive index"
objectMemory storePointerUnchecked: 2 ofObject: lit withValue: ConstZero.
objectMemory storePointerUnchecked: 3 ofObject: lit withValue: ConstZero.
"The function has not been loaded yet. Fetch module and function name."
moduleName := objectMemory fetchPointer: 0 ofObject: lit.
moduleName = objectMemory nilObject
ifTrue: [moduleLength := 0]
ifFalse: [(objectMemory isBytes: moduleName) ifFalse:
[self primitiveFailFor: PrimErrBadMethod].
moduleLength := objectMemory lengthOf: moduleName].
functionName := objectMemory fetchPointer: 1 ofObject: lit.
(objectMemory isBytes: functionName) ifFalse:
[self primitiveFailFor: PrimErrBadMethod].
functionLength := objectMemory lengthOf: functionName.
+ addr := self ioLoadExternalFunction: functionName + objectMemory baseHeaderSize
- addr := self ioLoadExternalFunction: functionName + self baseHeaderSize
OfLength: functionLength
+ FromModule: moduleName + objectMemory baseHeaderSize
- FromModule: moduleName + self baseHeaderSize
OfLength: moduleLength.
addr = 0
ifTrue: [index := -1]
ifFalse: ["add the function to the external primitive table"
index := self addToExternalPrimitiveTable: addr].
"Store the index (or -1 if failure) back in the literal"
objectMemory storePointerUnchecked: 3 ofObject: lit withValue: (objectMemory integerObjectOf: index).
"If the function has been successfully loaded cache and call it"
index >= 0
ifTrue:
[self rewriteMethodCacheEntryForExternalPrimitiveToFunction: (self cCode: [addr] inSmalltalk: [1000 + index]).
self callExternalPrimitive: addr]
ifFalse: ["Otherwise void the primitive function and fail"
self rewriteMethodCacheEntryForExternalPrimitiveToFunction: 0.
^self primitiveFailFor: PrimErrNotFound]!
Item was changed:
----- Method: StackInterpreterPrimitives>>primitivePerform (in category 'control primitives') -----
primitivePerform
<returnTypeC: #void>
| performSelector newReceiver lookupClass performMethod |
performSelector := messageSelector.
performMethod := newMethod.
messageSelector := self stackValue: argumentCount - 1.
newReceiver := self stackValue: argumentCount.
"NOTE: the following lookup may fail and be converted to #doesNotUnderstand:,
so we must adjust argumentCount and slide args now, so that will work."
"Slide arguments down over selector"
argumentCount := argumentCount - 1.
argumentCount to: 1 by: -1 do:
[:i|
stackPages
+ longAt: stackPointer + (i * objectMemory bytesPerWord)
+ put: (stackPages longAt: stackPointer + ((i - 1) * objectMemory bytesPerWord))].
- longAt: stackPointer + (i * BytesPerWord)
- put: (stackPages longAt: stackPointer + ((i - 1) * BytesPerWord))].
self pop: 1.
lookupClass := objectMemory fetchClassOf: newReceiver.
+ self sendBreak: messageSelector + objectMemory baseHeaderSize
- self sendBreak: messageSelector + self baseHeaderSize
point: (objectMemory lengthOf: messageSelector)
receiver: newReceiver.
self findNewMethodInClass: lookupClass.
"Only test CompiledMethods for argument count - other objects will have to take their chances"
((objectMemory isOopCompiledMethod: newMethod)
and: [(self argumentCountOf: newMethod) = argumentCount]) ifFalse:
["Slide the args back up (sigh) and re-insert the selector."
self unPop: 1.
1 to: argumentCount by: 1 do:
[:i |
+ stackPages longAt: stackPointer + ((i - 1) * objectMemory bytesPerWord)
+ put: (stackPages longAt: stackPointer + (i * objectMemory bytesPerWord))].
+ stackPages longAt: stackPointer + (argumentCount * objectMemory bytesPerWord) put: messageSelector.
- stackPages longAt: stackPointer + ((i - 1) * BytesPerWord)
- put: (stackPages longAt: stackPointer + (i * BytesPerWord))].
- stackPages longAt: stackPointer + (argumentCount * BytesPerWord) put: messageSelector.
argumentCount := argumentCount + 1.
newMethod := performMethod.
messageSelector := performSelector.
^self primitiveFail].
self executeNewMethod.
"Recursive xeq affects primErrorCode"
self initPrimCall!
Item was changed:
----- Method: StackInterpreterPrimitives>>primitiveTerminateTo (in category 'control primitives') -----
primitiveTerminateTo
"Primitive. Terminate up the context stack from the receiver up to but not including
the argument, if previousContext is on my Context stack. Make previousContext my
sender. This prim has to shadow the code in ContextPart>terminateTo: to be correct."
| thisCtx currentCtx aContextOrNil contextsFP contextsSP contextsIP nextCntx stackedReceiverOffset
theFP newFP newSP pageToStopOn thePage frameAbove |
<var: #contextsFP type: #'char *'>
<var: #theFP type: #'char *'>
<var: #newFP type: #'char *'>
<var: #newSP type: #'char *'>
<var: #contextsIP type: #usqInt>
<var: #frameAbove type: #'char *'>
<var: #contextsSP type: #'char *'>
<var: #source type: #'char *'>
<var: #pageToStopOn type: #'StackPage *'>
<var: #thePage type: #'StackPage *'>
aContextOrNil := self stackTop.
(aContextOrNil = objectMemory nilObject or: [self isContext: aContextOrNil]) ifFalse:
[^self primitiveFail].
thisCtx := self stackValue: 1.
thisCtx = aContextOrNil ifTrue:
[^self primitiveFail].
"All stackPages need to have current head pointers to avoid confusion."
self externalWriteBackHeadFramePointers.
"If we're searching for aContextOrNil it might be on a stack page. Helps to know
if we can free a whole page or not, or if we can short-cut the termination."
(aContextOrNil ~= objectMemory nilObject and: [self isStillMarriedContext: aContextOrNil])
ifTrue: [contextsFP := self frameOfMarriedContext: aContextOrNil.
pageToStopOn := stackPages stackPageFor: contextsFP]
ifFalse: [pageToStopOn := 0].
"if thisCtx is married ensure it is a base frame. Then we can assign its sender."
(self isStillMarriedContext: thisCtx)
ifTrue:
[theFP := self frameOfMarriedContext: thisCtx.
"Optimize terminating thisContext. Move its frame down to be next to
aContextOrNil's frame. Common in the exception system and so helps to be fast."
(theFP = framePointer
and: [pageToStopOn = stackPage]) ifTrue:
[(self frameCallerFP: theFP) ~= contextsFP ifTrue:
[stackedReceiverOffset := self frameStackedReceiverOffset: theFP.
frameAbove := self findFrameAbove: contextsFP inPage: pageToStopOn.
contextsIP := self frameCallerSavedIP: frameAbove.
newSP := self frameCallerSP: frameAbove.
+ newFP := newSP - stackedReceiverOffset - objectMemory bytesPerWord.
- newFP := newSP - stackedReceiverOffset - BytesPerWord.
theFP + stackedReceiverOffset
to: stackPointer
+ by: objectMemory bytesPerWord negated
- by: BytesPerWord negated
do: [:source|
+ newSP := newSP - objectMemory bytesPerWord.
- newSP := newSP - BytesPerWord.
stackPages longAt: newSP put: (stackPages longAt: source)].
stackPages longAt: newFP + FoxSavedFP put: contextsFP.
stackPages longAt: newFP + FoxCallerSavedIP put: contextsIP.
self assert: (self isContext: thisCtx).
objectMemory storePointerUnchecked: SenderIndex
ofObject: thisCtx
withValue: (self withSmallIntegerTags: newFP).
objectMemory storePointerUnchecked: InstructionPointerIndex
ofObject: thisCtx
withValue: (self withSmallIntegerTags: contextsFP).
framePointer := newFP.
stackPointer := newSP].
self pop: 1.
self assert: stackPage = stackPages mostRecentlyUsedPage.
^nil].
theFP := self externalEnsureIsBaseFrame: theFP. "May cause a GC!!!!"
currentCtx := self frameCallerContext: theFP.
"May also reclaim aContextOrNil's page, hence..."
(aContextOrNil ~= objectMemory nilObject and: [self isStillMarriedContext: aContextOrNil])
ifTrue: [contextsFP := self frameOfMarriedContext: aContextOrNil.
pageToStopOn := stackPages stackPageFor: contextsFP]
ifFalse: [pageToStopOn := 0]]
ifFalse:
[currentCtx := objectMemory fetchPointer: SenderIndex ofObject: thisCtx].
(self context: thisCtx hasSender: aContextOrNil) ifTrue:
["Need to walk the stack freeing stack pages and nilling contexts."
[currentCtx = aContextOrNil
or: [currentCtx = objectMemory nilObject]] whileFalse:
[self assert: (self isContext: currentCtx).
(self isMarriedOrWidowedContext: currentCtx)
ifTrue:
[theFP := self frameOfMarriedContext: currentCtx.
thePage := stackPages stackPageFor: theFP.
"If externalEnsureIsBaseFrame: above has moved thisContext to its own stack
then we will always terminate to a frame on a different page. But if we are
terminating some other context to a context somewhere on the current page
we must save the active frames above that context. Things will look e.g. like this:
thisCtx 499383332 s MethodContext(ContextPart)>resume:
499380484 s BlockClosure>ensure:
499377320 s MethodContext(ContextPart)>handleSignal:
499373760 s MethodContext(ContextPart)>handleSignal:
499372772 s MessageNotUnderstood(Exception)>signal
499369068 s CodeSimulationTests(Object)>doesNotUnderstand: absentMethod
499368708 s [] in CodeSimulationTests>testDNU
(sender is 0xbffc2480 I CodeSimulationTests>runSimulated:)
------------
framePointer 0xbffc234c M MethodContext(ContextPart)>doPrimitive:method:receiver:args:
0xbffc2378 M MethodContext(ContextPart)>tryPrimitiveFor:receiver:args:
0xbffc23ac M MethodContext(ContextPart)>send:to:with:super:
0xbffc23e4 M MethodContext(ContextPart)>send:super:numArgs:
0xbffc2418 M MethodContext(InstructionStream)>interpretNextInstructionFor:
0xbffc2434 M MethodContext(ContextPart)>step
0xbffc2458 I MethodContext(ContextPart)>runSimulated:contextAtEachStep:
------------
(499368708's sender) 0xbffc2480 I CodeSimulationTests>runSimulated:
0xbffc249c M CodeSimulationTests>testDNU
0xbffc24bc I CodeSimulationTests(TestCase)>performTest
0xbffc24dc I [] in CodeSimulationTests(TestCase)>runCase
aContextOrNil 0xbffc24fc M BlockClosure>ensure:
0xbffc2520 I CodeSimulationTests(TestCase)>runCase
0xbffc253c M [] in TestResult>runCase:
When we find this case we move the frames above to a new page by making the
frame above currentCtx a base frame, i.e. making 0xbffc2458 in the above example
a base frame. But in this iteration of the loop we don't move down a frame i.e. currentCtx
doesn't change on this iteration."
thePage = stackPage
ifTrue:
[frameAbove := self findFrameAbove: theFP inPage: thePage.
self assert: frameAbove ~= 0.
frameAbove := self externalEnsureIsBaseFrame: frameAbove. "May cause a GC!!!! May also reclaim aContextOrNil's page, hence..."
(aContextOrNil ~= objectMemory nilObject and: [self isStillMarriedContext: aContextOrNil])
ifTrue: [contextsFP := self frameOfMarriedContext: aContextOrNil.
pageToStopOn := stackPages stackPageFor: contextsFP]
ifFalse: [pageToStopOn := 0]]
ifFalse:
[thePage = pageToStopOn
ifTrue:
["We're here. Cut back the stack to aContextOrNil's frame,
push its instructionPointer if it's not already a head frame,
and we're done."
frameAbove := self findFrameAbove: contextsFP inPage: thePage.
frameAbove ~= 0 ifTrue:
+ [contextsSP := (self frameCallerSP: frameAbove) - objectMemory bytesPerWord.
- [contextsSP := (self frameCallerSP: frameAbove) - BytesPerWord.
stackPages longAt: contextsSP put: (self frameCallerSavedIP: frameAbove).
self setHeadFP: contextsFP andSP: contextsSP inPage: thePage].
currentCtx := aContextOrNil]
ifFalse:
["We can free the entire page without further ado."
currentCtx := self frameCallerContext: thePage baseFP.
"for a short time invariant is violated; assert follows"
stackPages freeStackPageNoAssert: thePage]]]
ifFalse:
[nextCntx := objectMemory fetchPointer: SenderIndex ofObject: currentCtx.
self markContextAsDead: currentCtx.
currentCtx := nextCntx]]].
self assert: stackPages pageListIsWellFormed.
(self isMarriedOrWidowedContext: thisCtx)
ifTrue:
[self assert: (self checkIsStillMarriedContext: thisCtx currentFP: framePointer).
self assert: (self isBaseFrame: (self frameOfMarriedContext: thisCtx)).
theFP := self frameOfMarriedContext: thisCtx.
self frameCallerContext: theFP put: aContextOrNil]
ifFalse: [objectMemory storePointer: SenderIndex ofObject: thisCtx withValue: aContextOrNil].
self pop: 1.
self assert: stackPage = stackPages mostRecentlyUsedPage.
^nil!
Item was changed:
----- Method: StackInterpreterPrimitives>>primitiveVMParameter (in category 'system control primitives') -----
(excessive size, no diff calculated)
Item was changed:
----- Method: StackInterpreterSimulator>>clipboardWrite:From:At: (in category 'I/O primitives') -----
clipboardWrite: sz From: actualDataAddress At: ignored
+ Clipboard clipboardText: (self stringOf: actualDataAddress - objectMemory baseHeaderSize)!
- Clipboard clipboardText: (self stringOf: actualDataAddress - BaseHeaderSize)!
Item was changed:
----- Method: StackInterpreterSimulator>>shortPrint: (in category 'debug support') -----
shortPrint: oop
| name classOop |
(objectMemory isIntegerObject: oop) ifTrue: [^ '=' , (objectMemory integerValueOf: oop) printString ,
' (' , (objectMemory integerValueOf: oop) hex , ')'].
(oop between: objectMemory startOfMemory and: objectMemory freeStart) ifFalse:
[^' is not on the heap'].
+ (oop bitAnd: (objectMemory bytesPerWord - 1)) ~= 0 ifTrue:
- (oop bitAnd: (BytesPerWord - 1)) ~= 0 ifTrue:
[^' is misaligned'].
classOop := objectMemory fetchClassOf: oop.
(objectMemory sizeBitsOf: classOop) = metaclassSizeBytes ifTrue: [
^ 'class ' , (self nameOfClass: oop)].
name := self nameOfClass: classOop.
name size = 0 ifTrue: [name := '??'].
name = 'String' ifTrue: [^ (self stringOf: oop) printString].
name = 'ByteString' ifTrue: [^ (self stringOf: oop) printString].
name = 'Symbol' ifTrue: [^ '#' , (self stringOf: oop)].
name = 'ByteSymbol' ifTrue: [^ '#' , (self stringOf: oop)].
name = 'Character' ifTrue: [^ '=' , (Character value: (objectMemory integerValueOf:
(objectMemory fetchPointer: 0 ofObject: oop))) printString].
name = 'UndefinedObject' ifTrue: [^ 'nil'].
name = 'False' ifTrue: [^ 'false'].
name = 'True' ifTrue: [^ 'true'].
name = 'Float' ifTrue: [^ '=' , (self dbgFloatValueOf: oop) printString].
name = 'Association' ifTrue: [^ '(' ,
+ (self shortPrint: (self longAt: oop + objectMemory baseHeaderSize)) ,
- (self shortPrint: (self longAt: oop + BaseHeaderSize)) ,
' -> ' ,
+ (self longAt: oop + objectMemory baseHeaderSize + objectMemory bytesPerWord) hex8 , ')'].
- (self longAt: oop + BaseHeaderSize + BytesPerWord) hex8 , ')'].
('AEIOU' includes: name first)
ifTrue: [^ 'an ' , name]
ifFalse: [^ 'a ' , name]!
Item was changed:
----- Method: StackInterpreterSimulator>>shortPrintRelative: (in category 'debug support') -----
shortPrintRelative: oop
| name classOop |
(objectMemory isIntegerObject: oop) ifTrue:
[^'=' , (objectMemory integerValueOf: oop) printString ,
' (' , (objectMemory integerValueOf: oop) hex , ')'].
(oop between: objectMemory startOfMemory and: objectMemory freeStart) ifFalse:
[^' is not on the heap'].
+ (oop bitAnd: (objectMemory bytesPerWord - 1)) ~= 0 ifTrue:
- (oop bitAnd: (BytesPerWord - 1)) ~= 0 ifTrue:
[^' is misaligned'].
classOop := objectMemory fetchClassOfNonInt: oop.
(objectMemory sizeBitsOf: classOop) = metaclassSizeBytes ifTrue: [
^'class ' , (self nameOfClass: oop)].
name := self nameOfClass: classOop.
name size = 0 ifTrue: [name := '??'].
name = 'String' ifTrue: [^(self stringOf: oop) printString].
name = 'ByteString' ifTrue: [^(self stringOf: oop) printString].
name = 'Symbol' ifTrue: [^'#' , (self stringOf: oop)].
name = 'ByteSymbol' ifTrue: [^'#' , (self stringOf: oop)].
name = 'Character' ifTrue: [^'=' , (Character value: (objectMemory integerValueOf:
(objectMemory fetchPointer: 0 ofObject: oop))) printString].
name = 'UndefinedObject' ifTrue: [^'nil'].
name = 'False' ifTrue: [^'false'].
name = 'True' ifTrue: [^'true'].
name = 'Float' ifTrue: [^'=' , (self dbgFloatValueOf: oop) printString].
name = 'Association' ifTrue:
[| valOop |
+ valOop := self longAt: oop + objectMemory baseHeaderSize + objectMemory bytesPerWord.
- valOop := self longAt: oop + BaseHeaderSize + BytesPerWord.
^'(' ,
+ (self shortPrint: (self longAt: oop + objectMemory baseHeaderSize)) ,
- (self shortPrint: (self longAt: oop + BaseHeaderSize)) ,
' -> ' ,
((objectMemory isIntegerObject: valOop) ifTrue: [valOop] ifFalse: [valOop - objectMemory startOfMemory]) hex8 , ')'].
^(('AEIOU' includes: name first)
ifTrue: ['an ']
ifFalse: ['a ']) , name!
Item was changed:
----- Method: StackInterpreterSimulator>>stringOf: (in category 'debug support') -----
stringOf: oop
| size long nLongs chars |
^ String streamContents:
[:strm |
size := 100 min: (self stSizeOf: oop).
+ nLongs := size-1//objectMemory bytesPerWord+1.
- nLongs := size-1//BytesPerWord+1.
1 to: nLongs do:
+ [:i | long := self longAt: oop + objectMemory baseHeaderSize + (i-1*objectMemory bytesPerWord).
- [:i | long := self longAt: oop + BaseHeaderSize + (i-1*BytesPerWord).
chars := self charsOfLong: long.
strm nextPutAll: (i=nLongs
+ ifTrue: [chars copyFrom: 1 to: size-1\\objectMemory bytesPerWord+1]
- ifTrue: [chars copyFrom: 1 to: size-1\\BytesPerWord+1]
ifFalse: [chars])]]!
Item was changed:
----- Method: StackInterpreterSimulator>>vmPathGet:Length: (in category 'file primitives') -----
vmPathGet: stringBase Length: stringSize
| pathName stringOop |
pathName := Smalltalk vmPath.
+ stringOop := stringBase - objectMemory baseHeaderSize. "Due to C call in Interp"
- stringOop := stringBase - BaseHeaderSize. "Due to C call in Interp"
1 to: stringSize do:
[:i | objectMemory storeByte: i-1 ofObject: stringOop
withValue: (pathName at: i) asciiValue].
!
Item was changed:
----- Method: StackInterpreterSimulator>>writeImageFileIO: (in category 'image save/restore') -----
writeImageFileIO: numberOfBytesToWrite
"Actually emit the first numberOfBytesToWrite object memory bytes onto the snapshot."
| headerSize file |
+ objectMemory bytesPerWord = 4 ifFalse: [self error: 'Not rewritten for 64 bits yet'].
- BytesPerWord = 4 ifFalse: [self error: 'Not rewritten for 64 bits yet'].
headerSize := 64.
[
file := (FileStream fileNamed: imageName) binary.
file == nil ifTrue: [^nil].
{
self imageFormatVersion.
headerSize.
numberOfBytesToWrite.
objectMemory startOfMemory.
(objectMemory getSpecialObjectsOop).
(objectMemory getLastHash).
self ioScreenSize.
fullScreenFlag.
extraVMMemory
}
do: [:long | self putLong: long toFile: file].
{ desiredNumStackPages. self unknownShortOrCodeSizeInKs } do:
[:short| self putShort: short toFile: file].
self putLong: desiredEdenBytes toFile: file.
{ maxExtSemTabSizeSet ifTrue: [self ioGetMaxExtSemTableSize] ifFalse: [0]. 0 } do:
[:short| self putShort: short toFile: file].
"Pad the rest of the header."
4 timesRepeat: [self putLong: 0 toFile: file].
"Position the file after the header."
file position: headerSize.
"Write the object memory."
objectMemory startOfMemory // 4 + 1
to: numberOfBytesToWrite // 4
do: [:index |
self
putLong: (objectMemory getMemory at: index)
toFile: file].
self success: true
]
ensure: [file close]!
Item was changed:
----- Method: StackInterpreterSimulatorLSB>>nextLongFrom: (in category 'initialization') -----
nextLongFrom: aStream
"Read a 32- or 64-bit quantity from the given (binary) stream."
+ ^ aStream nextLittleEndianNumber: objectMemory bytesPerWord!
- ^ aStream nextLittleEndianNumber: BytesPerWord!
Item was added:
+ ----- Method: TMethod>>superExpansionNodeFor:args: (in category 'inlining') -----
+ superExpansionNodeFor: aSelector args: argumentNodes
+ "Answer the expansion of a super send. Merge the super expansion's
+ locals, properties and comment into this method's properties."
+ (definingClass superclass lookupSelector: aSelector)
+ ifNil: [self error: 'superclass does not define super method']
+ ifNotNil:
+ [:superMethod| | superTMethod commonVars varMap |
+ superTMethod := superMethod methodNode asTranslationMethodOfClass: self class.
+ ((argumentNodes allSatisfy: [:parseNode| parseNode isVariableNode])
+ and: [(argumentNodes asOrderedCollection collect: [:parseNode| parseNode key]) = superTMethod args]) ifFalse:
+ [self error: definingClass name, '>>',selector, ' args ~= ',
+ superTMethod definingClass name, '>>', aSelector,
+ (String with: $. with: Character cr),
+ 'For super expansions to be translated correctly each argument must be a variable with the same name as the corresponding argument in the super method.'].
+ self mergePropertiesOfSuperMethod: superTMethod.
+ (commonVars := superTMethod locals intersection: self locals) notEmpty ifTrue:
+ [varMap := Dictionary new.
+ commonVars do:
+ [:k| varMap at: k put: (superTMethod unusedNamePrefixedBy: k avoiding: self allLocals)].
+ superTMethod renameVariablesUsing: varMap].
+ self assert: (superTMethod locals allSatisfy: [:var| (self locals includes: var) not]).
+ locals addAll: superTMethod locals.
+ superTMethod declarations keysAndValuesDo:
+ [:var :decl|
+ self declarationAt: var put: decl].
+ superTMethod comment ifNotNil:
+ [:superComment|
+ comment := comment
+ ifNil: [superComment]
+ ifNotNil: [superComment, comment]].
+ superTMethod extraVariableNumber ifNotNil:
+ [:scvn|
+ extraVariableNumber := extraVariableNumber ifNil: [scvn] ifNotNil: [:cvn| cvn + scvn]].
+ superTMethod elideAnyFinalReturn.
+ ^superTMethod parseTree]!
Item was changed:
----- Method: VMMaker class>>versionString (in category 'version testing') -----
versionString
"VMMaker versionString"
+ ^'4.13.12'!
- ^'4.13.11'!
Item was changed:
----- Method: VMStackFrameOffsets class>>initializeFrameIndices (in category 'class initialization') -----
initializeFrameIndices
"Format of a stack frame. Word-sized indices relative to the frame pointer.
Terminology
Frames are either single (have no context) or married (have a context).
Contexts are either single (exist on the heap), married (have a context) or widowed (had a frame that has exited).
Stacks grow down:
receiver for method activations/closure for block activations
arg0
...
argN
caller's method ip/base frame's sender context
fp-> saved fp
method
frame flags
context (uninitialized)
receiver
first temp
...
sp-> Nth temp
frame flags holds the number of arguments (since argument temporaries are above the frame)
the flag for a block activation
and the flag indicating if the context field is valid (whether the frame is married).
The first frame in a stack page is the baseFrame and is marked as such by a null saved fp,
in which case the saved method ip is actually the context (possibly hybrid) beneath the base frame"
| fxCallerSavedIP fxSavedFP fxMethod fxFrameFlags fxThisContext fxReceiver |
fxCallerSavedIP := 1.
fxSavedFP := 0.
fxMethod := -1.
fxFrameFlags := -2. "Can find numArgs, needed for fast temp access. args are above fxCallerSavedIP.
Can find ``is block'' bit
Can find ``has context'' bit"
fxThisContext := -3.
fxReceiver := -4.
FrameSlots := fxCallerSavedIP - fxReceiver + 1.
+ FoxCallerSavedIP := fxCallerSavedIP * self bytesPerWord.
- FoxCallerSavedIP := fxCallerSavedIP * BytesPerWord.
"In base frames the caller saved ip field holds the caller context."
FoxCallerContext := FoxCallerSavedIP.
+ FoxSavedFP := fxSavedFP * self bytesPerWord.
+ FoxMethod := fxMethod * self bytesPerWord.
+ FoxFrameFlags := fxFrameFlags * self bytesPerWord.
+ FoxThisContext := fxThisContext * self bytesPerWord.
+ FoxReceiver := fxReceiver * self bytesPerWord!
- FoxSavedFP := fxSavedFP * BytesPerWord.
- FoxMethod := fxMethod * BytesPerWord.
- FoxFrameFlags := fxFrameFlags * BytesPerWord.
- FoxThisContext := fxThisContext * BytesPerWord.
- FoxReceiver := fxReceiver * BytesPerWord!
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1128.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.1128
Author: eem
Time: 28 March 2015, 2:26:04.224 pm
UUID: 4947273c-262c-4a41-bec3-ad0e940276b3
Ancestors: VMMaker.oscog-eem.1127
Oops! remember to answer an abstract register
derived mask for ARM's callerSavedRegisterMask.
Change the ARM reg assignments to use r0 for
TempReg and r7 for ResultReceiverReg.
At some stage (e.g. when Clément arrives to work
on Sista) the register mask machinery may have to
change to use concrete register numbers to allow
the allocator to allocate more registers than can
be named as abstract registers.
=============== Diff against VMMaker.oscog-eem.1127 ===============
Item was changed:
----- Method: CogARMCompiler>>callerSavedRegisterMask (in category 'accessing') -----
callerSavedRegisterMask
"According to IHI0042E ARM Architecture Procedure Calling Standard, in section 5.1.1:
A subroutine must preserve the contents of the registers r4-r8, r10, r11 and SP (and r9 in PCS variants that designate r9 as v6).
SP = r13, so the callee-saved regs are r4-r8 & r10-r12.
The caller-saved registers are those that are not callee-saved and not reserved for hardware/abi uses,
+ i..e r0-r3, r9 & r12. We can't name all the C argument registers. So..."
+ ^cogit
+ registerMaskFor: (self abstractRegisterForConcreteRegister: 0)
+ "and: (self abstractRegisterForConcreteRegister: 1)"
+ "and: (self abstractRegisterForConcreteRegister: 2)"
+ "and: (self abstractRegisterForConcreteRegister: 3)"
+ "and: (self abstractRegisterForConcreteRegister: 9)"
+ and: (self abstractRegisterForConcreteRegister: 12)!
- i..e r0-r3, r9 & r12."
- ^2r1001000001111!
Item was changed:
----- Method: CogARMCompiler>>concreteRegister: (in category 'encoding') -----
concreteRegister: registerIndex
"Map a possibly abstract register into a concrete one. Abstract registers
(defined in CogAbstractOpcodes) are all negative. If registerIndex is
negative assume it is an abstract register."
"N.B. According to BSABI, R0-R3 are caller-save, R4-R12 are callee save.
Note that R9 might be a special register for the implementation. In some slides
it is refered to as sb. R10 can contain the stack limit (sl), R11 the fp. R12 is an
intra-procedure scratch instruction pointer for link purposes. It can also be used.
R10 is used as temporary inside a single abstract opcode implementation"
"R0-R3 are used when calling back to the interpreter. Using them would require
saving and restoring their values, so they are omitted so far. R12 is the only
unused register at the moment.."
^registerIndex
caseOf: {
+ [TempReg] -> [R0].
- [TempReg] -> [R7].
[ClassReg] -> [R8].
+ [ReceiverResultReg] -> [R7].
- [ReceiverResultReg] -> [R9].
[SendNumArgsReg] -> [R6].
[SPReg] -> [SP]. "R13"
[FPReg] -> [R11].
[Arg0Reg] -> [R4].
[Arg1Reg] -> [R5].
[VarBaseReg] -> [ConcreteVarBaseReg]. "Must be callee saved"
[RISCTempReg] -> [ConcreteIPReg]. "a.k.a. IP"
[LinkReg] -> [LR]. "R14"
[PCReg] -> [PC] "R15" }
otherwise:
[self assert: (registerIndex between: R0 and: PC).
registerIndex]!
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1127.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.1127
Author: eem
Time: 28 March 2015, 2:00:26.196 pm
UUID: 5f21363d-74e9-4c95-8c48-6f6d18ef3890
Ancestors: VMMaker.oscog-tpr.1126
Rename executeCogMethod:... to executeCogPIC:...
Add support for a variable base register for
referring to the CoInterpreter variables from
machine code on RISCs (ARM). Load the VarBaseReg
in enilopmarts. It must be a callee-saved reg.
Add support for a 3 argument AndCqRR and use it
in the entry-point sequence. This has the nice side-
effect of fixing the inability to differentiate the
checked and unchecked entry-points on ARM if we
use the MoveRR, AndCqR two instruction sequence ;)
Nuke the unused and misleading callsAreRelative.
Mark the other backEnd ability test methods as
<inline: true>.
Simulator:
Add print cog methods with selector... to the utils menu.
=============== Diff against VMMaker.oscog-tpr.1126 ===============
Item was removed:
- ----- Method: CoInterpreter>>executeCogMethod:fromLinkedSendWithReceiver:andCacheTag: (in category 'enilopmarts') -----
- executeCogMethod: cogMethod fromLinkedSendWithReceiver: rcvr andCacheTag: cacheTag
- <api>
- "Execute a CogMethod from a linked send. The receiver,
- arguments and return address are on the Smalltalk stack. First
- push the entry-point and finally the register argument(s). Then write
- back the frame pointers and call the routine that will pop off the register
- argument(s) and jump to the entry by executing a return instruction.
-
- In the simple jit only the receiver gets passed in registers, so only the
- receiver gets pushed."
- <var: #cogMethod type: #'CogMethod *'>
- cogit assertCStackWellAligned.
- self assert: (self isMachineCodeFrame: framePointer).
- self assertValidExecutionPointe: self stackTop r: framePointer s: stackPointer imbar: false line: #'__LINE__'.
- self push: cogMethod asInteger + cogit entryOffset.
- cogit numRegArgs > 0 ifTrue:"dont use and: so as to get Slang to inline cogit numRegArgs > 0"
- [cogMethod cmNumArgs <= cogit numRegArgs ifTrue:
- [self push: cacheTag.
- cogMethod cmNumArgs caseOf: {
- [0] -> [cogit ceCall0ArgsPIC].
- [1] -> [cogit ceCall1ArgsPIC].
- [2] -> [cogit ceCall2ArgsPIC]
- }
- otherwise: [].
- self error: 'not reached']].
- self
- push: rcvr;
- push: cacheTag.
- cogit ceCallCogCodePopReceiverAndClassRegs
- "NOTREACHED"!
Item was added:
+ ----- Method: CoInterpreter>>executeCogPIC:fromLinkedSendWithReceiver:andCacheTag: (in category 'enilopmarts') -----
+ executeCogPIC: cogPIC fromLinkedSendWithReceiver: rcvr andCacheTag: cacheTag
+ <api>
+ "Execute a closed PIC from a linked send, to redispatch based on the rcvr.
+ The receiver, arguments and return address are on the Smalltalk stack.
+ First push the entry-point and finally the register argument(s). Then write
+ back the frame pointers and call the routine that will pop off the register
+ argument(s) and jump to the entry by executing a return instruction.
+
+ In the simple jit only the receiver gets passed in registers, so only the
+ receiver gets pushed."
+ <var: #cogPIC type: #'CogMethod *'>
+ cogit assertCStackWellAligned.
+ self assert: (self isMachineCodeFrame: framePointer).
+ self assertValidExecutionPointe: self stackTop r: framePointer s: stackPointer imbar: false line: #'__LINE__'.
+ self push: cogPIC asInteger + cogit entryOffset.
+ cogit numRegArgs > 0 ifTrue:"dont use and: so as to get Slang to inline cogit numRegArgs > 0"
+ [cogPIC cmNumArgs <= cogit numRegArgs ifTrue:
+ [self push: cacheTag.
+ cogPIC cmNumArgs caseOf: {
+ [0] -> [cogit ceCall0ArgsPIC].
+ [1] -> [cogit ceCall1ArgsPIC].
+ [2] -> [cogit ceCall2ArgsPIC]
+ }
+ otherwise: [].
+ self error: 'not reached']].
+ self
+ push: rcvr;
+ push: cacheTag.
+ cogit ceCallCogCodePopReceiverAndClassRegs
+ "NOTREACHED"!
Item was changed:
CogAbstractInstruction subclass: #CogARMCompiler
instanceVariableNames: 'cond'
+ classVariableNames: 'AL AddOpcode AndOpcode BICCqR BicOpcode CArg0Reg CArg1Reg CArg2Reg CArg3Reg CC CPSRReg CS CmpOpcode ConcreteIPReg ConcreteVarBaseReg EQ GE GT HI LDMFD LE LR LS LT MI MRS MSR MoveNotOpcode MoveOpcode NE OrOpcode OverflowFlag PC PL R0 R1 R10 R11 R12 R2 R3 R4 R5 R6 R7 R8 R9 RsbOpcode SMLALOpcode SMULL SP STMFD SubOpcode VC VS XorOpcode'
- classVariableNames: 'AL AddOpcode AndOpcode BICCqR BicOpcode CArg0Reg CArg1Reg CArg2Reg CArg3Reg CC CPSRReg CS CmpOpcode EQ GE GT HI LDMFD LE LR LS LT MI MRS MSR MoveNotOpcode MoveOpcode NE OrOpcode OverflowFlag PC PL R0 R1 R10 R11 R12 R2 R3 R4 R5 R6 R7 R8 R9 RsbOpcode SMLALOpcode SMULL SP STMFD SubOpcode VC VS XorOpcode'
poolDictionaries: ''
category: 'VMMaker-JIT'!
!CogARMCompiler commentStamp: 'lw 8/23/2012 19:38' prior: 0!
I generate ARM instructions from CogAbstractInstructions. For reference see
http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.set.architectur…
The Architecture Reference Manual used is that of version 5, which includes some version 6 instructions. Of those, only pld is used(for PrefetchAw).
This class does not take any special action to flush the instruction cache on instruction-modification.!
Item was removed:
- ----- Method: CogARMCompiler class>>ARMTempReg (in category 'accessing') -----
- ARMTempReg
- "return the name of the general temp reg in the ARM APCS convention"
- ^RISCTempReg!
Item was added:
+ ----- Method: CogARMCompiler class>>IPReg (in category 'accessing') -----
+ IPReg
+ "Answer the number of the general temp reg in the ARM APCS convention, IP"
+ ^ConcreteIPReg!
Item was added:
+ ----- Method: CogARMCompiler class>>VarBaseReg (in category 'accessing') -----
+ VarBaseReg
+ "Answer the number of the reg we use to hold the base address of CoInterpreter variables"
+ ^ConcreteVarBaseReg!
Item was changed:
----- Method: CogARMCompiler class>>initialize (in category 'class initialization') -----
initialize
"Initialize various ARM instruction-related constants."
"CogARMCompiler initialize"
| specificOpcodes refs |
super initialize.
self ~~ CogARMCompiler ifTrue: [^self].
R0 := 0.
R1 := 1.
R2 := 2.
R3 := 3.
R4 := 4.
R5 := 5.
R6 := 6.
R7 := 7.
R8 := 8.
R9 := 9.
R10 := 10.
R11 := 11.
+ R12 := 12.
+ SP := 13.
- R12 := 12..
- SP := 13..
LR := 14.
PC := 15.
CArg0Reg := 0.
CArg1Reg := 1.
CArg2Reg := 2.
CArg3Reg := 3.
+
+ ConcreteVarBaseReg := 10.
+ ConcreteIPReg := 12. "IP, The Intra-Procedure-call scratch register."
- RISCTempReg := R10.
-
"Condition Codes. Note that cc=16rF is NOT ALLOWED as a condition; it specifies an extension instruction. See e.g.ARM_ARM v5 DDI01001.pdf A3.2.1"
EQ := 0.
NE := 1.
CS := 2.
CC := 3.
MI := 4.
PL := 5.
VS := 6.
VC := 7.
HI := 8.
LS := 9.
GE := 10.
LT := 11.
GT := 12.
LE := 13.
AL := 14.
AddOpcode := 4.
AndOpcode := 0.
BicOpcode := 14.
CmpOpcode := 10.
MoveOpcode := 13.
+ MoveNotOpcode := 15.
OrOpcode := 12.
RsbOpcode := 3.
SubOpcode := 2.
XorOpcode := 1.
SMLALOpcode := 7.
- MoveNotOpcode := 15.
CPSRReg := 16.
OverflowFlag := 1 << 28.
"Specific instructions"
LastRTLCode isNil ifTrue:
[CogRTLOpcodes initialize].
specificOpcodes := #(SMULL MSR MRS LDMFD STMFD BICCqR).
refs := (thisContext method literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect:
[:ea| ea key].
(classPool keys reject: [:k| (specificOpcodes includes: k) or: [refs includes: k]]) do:
[:k|
Undeclared declare: k from: classPool].
specificOpcodes withIndexDo:
[:classVarName :value|
self classPool
declare: classVarName from: Undeclared;
at: classVarName put: value + LastRTLCode - 1]!
Item was added:
+ ----- Method: CogARMCompiler>>abstractRegisterForConcreteRegister: (in category 'private') -----
+ abstractRegisterForConcreteRegister: reg
+ (self concreteRegister: TempReg) = reg ifTrue: [^TempReg].
+ (self concreteRegister: ReceiverResultReg) = reg ifTrue: [^ReceiverResultReg].
+ (self concreteRegister: ClassReg) = reg ifTrue: [^ClassReg].
+ (self concreteRegister: SendNumArgsReg) = reg ifTrue: [^SendNumArgsReg].
+ (self concreteRegister: Arg0Reg) = reg ifTrue: [^Arg0Reg].
+ (self concreteRegister: Arg1Reg) = reg ifTrue: [^Arg1Reg].
+ (self concreteRegister: FPReg) = reg ifTrue: [^FPReg].
+ (self concreteRegister: SPReg) = reg ifTrue: [^SPReg].
+ (self concreteRegister: LinkReg) = reg ifTrue: [^LinkReg].
+ (self concreteRegister: RISCTempReg) = reg ifTrue: [^RISCTempReg].
+ (self concreteRegister: PCReg) = reg ifTrue: [^PCReg].
+ (self concreteRegister: VarBaseReg) = reg ifTrue: [^VarBaseReg].
+ self error: 'could not find abstract register'.
+ ^0
+
+ "({ TempReg. ReceiverResultReg. ClassReg. SendNumArgsReg. Arg0Reg. Arg1Reg.
+ FPReg. SPReg.
+ LinkReg. RISCTempReg. PCReg. VarBaseReg} collect: [:i| self basicNew concreteRegister: i]) sort"
+
+ "While the below works fine in Smalltalk it of course doesn't work in C ;)"
+
+ "^reg caseOf: {
+ [self concreteRegister: TempReg] -> [TempReg].
+ [self concreteRegister: ReceiverResultReg] -> [ReceiverResultReg].
+ [self concreteRegister: ClassReg] -> [ClassReg].
+ [self concreteRegister: SendNumArgsReg] -> [SendNumArgsReg].
+ [self concreteRegister: Arg0Reg] -> [Arg0Reg].
+ [self concreteRegister: Arg1Reg] -> [Arg1Reg].
+ [self concreteRegister: FPReg] -> [FPReg].
+ [self concreteRegister: SPReg] -> [SPReg] }"!
Item was changed:
----- Method: CogARMCompiler>>callerSavedRegisterMask (in category 'accessing') -----
callerSavedRegisterMask
+ "According to IHI0042E ARM Architecture Procedure Calling Standard, in section 5.1.1:
+ A subroutine must preserve the contents of the registers r4-r8, r10, r11 and SP (and r9 in PCS variants that designate r9 as v6).
+ SP = r13, so the callee-saved regs are r4-r8 & r10-r12.
+ The caller-saved registers are those that are not callee-saved and not reserved for hardware/abi uses,
+ i..e r0-r3, r9 & r12."
+ ^2r1001000001111!
- "registers r0-r3, the lowest four, +lr"
- ^2r100000000001111!
Item was changed:
----- Method: CogARMCompiler>>canDivQuoRem (in category 'testing') -----
canDivQuoRem
+ <inline: true>
^false!
Item was changed:
----- Method: CogARMCompiler>>canMulRR (in category 'testing') -----
canMulRR
+ <inline: true>
^true!
Item was changed:
----- Method: CogARMCompiler>>computeMaximumSize (in category 'generate machine code') -----
computeMaximumSize
"Because we don't use Thumb, each ARM instruction has 4 bytes. Some abstract opcodes need more than one instruction."
(opcode between: FirstShortJump and: LastJump) ifTrue:
[^maxSize := 16].
opcode
caseOf: {
[Label] -> [^maxSize := 0].
[AlignmentNops] -> [^maxSize := (operands at: 0) - 1].
+ [MoveAwR] -> [^maxSize := (self isAddressRelativeToVarBase: (operands at: 0))
+ ifTrue: [4]
+ ifFalse: [20]].
- [MoveAwR] -> [^maxSize := 20].
[MoveCqR] -> [^self rotateable8bitImmediate: (operands at: 0)
ifTrue: [:r :i| maxSize := 4]
ifFalse: [maxSize := 16]].
[MoveCwR] -> [^maxSize := 16].
+ [MoveRAw] -> [^maxSize := (self isAddressRelativeToVarBase: (operands at: 1))
+ ifTrue: [4]
+ ifFalse: [20]].
- [MoveRAw] -> [^maxSize := 20].
[MoveRMwr] -> [self is12BitValue: (operands at: 1)
ifTrue: [ :u :i | ^maxSize := 4]
ifFalse: [ ^maxSize := 20 ]].
[MoveRMbr] -> [self is12BitValue: (operands at: 1)
ifTrue: [ :u :i | ^maxSize := 4]
ifFalse: [ ^maxSize := 20 ]].
[MoveMwrR] -> [self is12BitValue: (operands at: 0)
ifTrue: [ :u :i | ^maxSize := 4]
ifFalse: [ ^maxSize := 20 ]].
[MoveMbrR] -> [self is12BitValue: (operands at: 0)
ifTrue: [ :u :i | ^maxSize := 4]
ifFalse: [ ^maxSize := 20 ]].
+ [PrefetchAw] -> [^maxSize := (self isAddressRelativeToVarBase: (operands at: 1))
+ ifTrue: [4]
+ ifFalse: [20]].
- [PrefetchAw] -> [^maxSize := 20].
[Call] -> [^maxSize := 20 "recomputed in #sizePCDependentInstruction."].
[RetN] -> [^(operands at: 0) = 0
ifTrue: [maxSize := 4]
ifFalse: [maxSize := 8]].
[CmpCqR] -> [^self rotateable8bitImmediate: (operands at: 0)
ifTrue: [:r :i| maxSize := 4]
ifFalse: [maxSize := 20]].
[AddCqR] -> [^self rotateable8bitImmediate: (operands at: 0)
ifTrue: [:r :i| maxSize := 4]
ifFalse: [maxSize := 20]].
[BICCqR] -> [^self rotateable8bitImmediate: (operands at: 0)
ifTrue: [:r :i| maxSize := 4]
ifFalse: [maxSize := 20]].
[SubCqR] -> [^self rotateable8bitImmediate: (operands at: 0)
ifTrue: [:r :i| maxSize := 4]
ifFalse: [maxSize := 20]].
[AndCqR] -> [^self rotateable8bitImmediate: (operands at: 0)
ifTrue: [:r :i| maxSize := 4]
ifFalse: [maxSize := 20]].
+ [AndCqRR] -> [^self rotateable8bitImmediate: (operands at: 0)
+ ifTrue: [:r :i| maxSize := 4]
+ ifFalse: [maxSize := 20]].
[OrCqR] -> [^self rotateable8bitImmediate: (operands at: 0)
ifTrue: [:r :i| maxSize := 4]
ifFalse: [maxSize := 20]].
[TstCqR] -> [^self rotateable8bitImmediate: (operands at: 0)
ifTrue: [:r :i| maxSize := 4]
ifFalse: [maxSize := 20]].
[XorCqR] -> [^self rotateable8bitImmediate: (operands at: 0)
ifTrue: [:r :i| maxSize := 4]
ifFalse: [maxSize := 20]].
[CmpCwR] -> [^maxSize := 20].
[AddCwR] -> [^maxSize := 20].
[SubCwR] -> [^maxSize := 20].
[AndCwR] -> [^maxSize := 20].
[OrCwR] -> [^maxSize := 20].
[XorCwR] -> [^maxSize := 20].
[JumpR] -> [^maxSize := 4].
[JumpFPEqual] -> [^maxSize := 8].
[JumpFPNotEqual] -> [^maxSize := 8].
[JumpFPLess] -> [^maxSize := 8].
[JumpFPGreaterOrEqual]-> [^maxSize := 8].
[JumpFPGreater] -> [^maxSize := 8].
[JumpFPLessOrEqual] -> [^maxSize := 8].
[JumpFPOrdered] -> [^maxSize := 8].
[JumpFPUnordered] -> [^maxSize := 8].
[JumpLong] -> [^maxSize := 20].
[JumpLongZero] -> [^maxSize := 20].
[JumpLongNonZero] -> [^maxSize := 20].
[LoadEffectiveAddressMwrR]
-> [^self rotateable8bitImmediate: (operands at: 0)
ifTrue: [:r :i| maxSize := 4]
ifFalse: [maxSize := 20]].
[PushCw] -> [^maxSize := 20].
}
otherwise: [^maxSize := 4].
^4 "to keep C compiler quiet"
!
Item was added:
+ ----- Method: CogARMCompiler>>concreteCalleeSavedRegisterMask (in category 'accessing') -----
+ concreteCalleeSavedRegisterMask
+ "According to IHI0042E ARM Architecture Procedure Calling Standard, in section 5.1.1:
+ A subroutine must preserve the contents of the registers r4-r8, r10, r11 and SP (and r9 in PCS variants that designate r9 as v6).
+ SP = r13, so..."
+ ^2r0000110111110000!
Item was added:
+ ----- Method: CogARMCompiler>>concreteCallerSavedRegisterMask (in category 'accessing') -----
+ concreteCallerSavedRegisterMask
+ "According to IHI0042E ARM Architecture Procedure Calling Standard, in section 5.1.1:
+ A subroutine must preserve the contents of the registers r4-r8, r10, r11 and SP (and r9 in PCS variants that designate r9 as v6).
+ SP = r13, so the callee-saved regs are r4-r8 & r10-r12.
+ The caller-saved registers are those that are not callee-saved and not reserved for hardware/abi uses,
+ i..e r0-r3, r9 & r12."
+ ^2r1001000001111!
Item was changed:
----- Method: CogARMCompiler>>concreteRegister: (in category 'encoding') -----
concreteRegister: registerIndex
"Map a possibly abstract register into a concrete one. Abstract registers
(defined in CogAbstractOpcodes) are all negative. If registerIndex is
negative assume it is an abstract register."
"N.B. According to BSABI, R0-R3 are caller-save, R4-R12 are callee save.
Note that R9 might be a special register for the implementation. In some slides
it is refered to as sb. R10 can contain the stack limit (sl), R11 the fp. R12 is an
intra-procedure scratch instruction pointer for link purposes. It can also be used.
R10 is used as temporary inside a single abstract opcode implementation"
"R0-R3 are used when calling back to the interpreter. Using them would require
saving and restoring their values, so they are omitted so far. R12 is the only
unused register at the moment.."
^registerIndex
caseOf: {
[TempReg] -> [R7].
[ClassReg] -> [R8].
[ReceiverResultReg] -> [R9].
[SendNumArgsReg] -> [R6].
+ [SPReg] -> [SP]. "R13"
- [SPReg] -> [SP].
[FPReg] -> [R11].
[Arg0Reg] -> [R4].
[Arg1Reg] -> [R5].
+ [VarBaseReg] -> [ConcreteVarBaseReg]. "Must be callee saved"
+ [RISCTempReg] -> [ConcreteIPReg]. "a.k.a. IP"
+ [LinkReg] -> [LR]. "R14"
+ [PCReg] -> [PC] "R15" }
- [LinkReg] -> [LR].
- [PCReg] -> [PC] }
otherwise:
[self assert: (registerIndex between: R0 and: PC).
registerIndex]!
Item was changed:
----- Method: CogARMCompiler>>concretizeAndCqR (in category 'generate machine code - concretize') -----
concretizeAndCqR
"Will get inlined into concretizeAt: switch."
"AND is very important since it's used to mask all sorts of flags in the jit. We take special care to try to find fast ways to make the masks"
<inline: true>
|val|
val := operands at: 0.
self rotateable8bitImmediate: val
ifTrue: [ :rot :immediate | | reg |
reg := self concreteRegister: (operands at: 1).
self machineCodeAt: 0 put: (self ands: reg rn: reg imm: immediate ror: rot).
^machineCodeSize := 4]
ifFalse: [
"see if the constant bit-inverted makes a quick value and if so BIC it instead
If the value is -ve, we 2s complement it instead"
|invVal|
val <0
ifTrue:[invVal := -1 - val]
ifFalse:[invVal := val bitInvert32].
self rotateable8bitImmediate: invVal
ifTrue: [ :rot :immediate | |reg|
reg := self concreteRegister: (operands at: 1).
self machineCodeAt: 0 put: (self bics: reg rn: reg imm: immediate ror: rot).
^machineCodeSize := 4]
ifFalse: ["let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF"
|hb reg|
reg := self concreteRegister: (operands at: 1).
hb := (operands at: 0) highBit.
1 << hb = (val +1)
ifTrue: [ "MVN temp reg, 0, making 0xffffffff"
+ self machineCodeAt: 0 put:(self mvn: ConcreteIPReg imm: 0 ror: 0).
- self machineCodeAt: 0 put:(self mvn: RISCTempReg imm: 0 ror: 0).
"Then AND reg, temp reg, lsr #(32-hb)"
+ self machineCodeAt: 4 put:(self ands: reg rn: reg rm: ConcreteIPReg lsr: (32-hb )).
- self machineCodeAt: 4 put:(self ands: reg rn: reg rm: RISCTempReg lsr: (32-hb )).
^machineCodeSize :=8]
ifFalse: [^self concretizeDataOperationCwR: AndOpcode]]]!
Item was added:
+ ----- Method: CogARMCompiler>>concretizeAndCqRR (in category 'generate machine code - concretize') -----
+ concretizeAndCqRR
+ "Will get inlined into concretizeAt: switch."
+ "AND is very important since it's used to mask all sorts of flags in the jit. We take special care to try to find fast ways to make the masks"
+ <inline: true>
+ | val srcReg dstReg |
+ val := operands at: 0.
+ srcReg := self concreteRegister: (operands at: 1).
+ dstReg := self concreteRegister: (operands at: 2).
+ self rotateable8bitImmediate: val
+ ifTrue:
+ [ :rot :immediate |
+ self machineCodeAt: 0 put: (self ands: dstReg rn: srcReg imm: immediate ror: rot).
+ ^machineCodeSize := 4]
+ ifFalse:
+ ["see if the constant bit-inverted makes a quick value and if so BIC it instead
+ If the value is -ve, we 2s complement it instead"
+ |invVal|
+ invVal := val < 0
+ ifTrue:[-1 - val]
+ ifFalse:[val bitInvert32].
+ self rotateable8bitImmediate: invVal
+ ifTrue:
+ [ :rot :immediate |
+ self machineCodeAt: 0 put: (self bics: dstReg rn: srcReg imm: immediate ror: rot).
+ ^machineCodeSize := 4]
+ ifFalse: "let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF"
+ [| hb |
+ hb := (operands at: 0) highBit.
+ 1 << hb = (val +1)
+ ifTrue: "MVN temp reg, 0, making 0xffffffff"
+ [self machineCodeAt: 0 put:(self mvn: ConcreteIPReg imm: 0 ror: 0).
+ "Then AND reg, temp reg, lsr #(32-hb)"
+ self machineCodeAt: 4 put: (self ands: dstReg rn: srcReg rm: ConcreteIPReg lsr: 32 - hb).
+ ^machineCodeSize := 8]
+ ifFalse:
+ [^self concretizeDataOperationCwR: AndOpcode]]]!
Item was changed:
----- Method: CogARMCompiler>>concretizeConditionalJumpLong: (in category 'generate machine code - concretize') -----
concretizeConditionalJumpLong: conditionCode
"Will get inlined into concretizeAt: switch."
"Sizing/generating jumps.
Jump targets can be to absolute addresses or other abstract instructions.
Generating initial trampolines instructions may have no maxSize and be to absolute addresses.
Otherwise instructions must have a machineCodeSize which must be kept to."
<inline: true>
| jumpTarget instrOffset|
<var: #jumpTarget type: #'AbstractInstruction *'>
jumpTarget := self longJumpTargetAddress.
+ instrOffset := self at: 0 moveCw: jumpTarget intoR: ConcreteIPReg.
- instrOffset := self at: 0 moveCw: jumpTarget intoR: RISCTempReg.
"bx RISCTempReg"
+ self machineCodeAt: instrOffset put: (self cond: conditionCode bx: 0 target: ConcreteIPReg).
- self machineCodeAt: instrOffset put: (self cond: conditionCode bx: 0 target: RISCTempReg).
^machineCodeSize := instrOffset + 4!
Item was changed:
----- Method: CogARMCompiler>>concretizeDataOperationCwR: (in category 'generate machine code - concretize') -----
concretizeDataOperationCwR: armOpcode
"Will get inlined into concretizeAt: switch."
"Load the word into the RISCTempReg, then cmp R, RISCTempReg"
<inline: true>
| constant rn rd instrOffset|
constant := operands at: 0.
rn := (self concreteRegister: (operands at: 1)).
rd := armOpcode = CmpOpcode ifTrue: [0] ifFalse:[rn].
+ instrOffset := self at: 0 moveCw: constant intoR: ConcreteIPReg.
- instrOffset := self at: 0 moveCw: constant intoR: RISCTempReg.
self machineCodeAt: instrOffset
+ put: (self type: 0 op: armOpcode set: 1 rn: rn rd: rd shifterOperand: ConcreteIPReg).
- put: (self type: 0 op: armOpcode set: 1 rn: rn rd: rd shifterOperand: RISCTempReg).
^machineCodeSize := instrOffset + 4!
Item was changed:
----- Method: CogARMCompiler>>concretizeLoadEffectiveAddressMwrR (in category 'generate machine code - concretize') -----
concretizeLoadEffectiveAddressMwrR
"Will get inlined into concretizeAt: switch."
"destReg = srcReg (which contains an address) + offset"
<inline: true>
| srcReg offset destReg instrOffset |
offset := operands at: 0.
srcReg := self concreteRegister: (operands at: 1).
destReg := self concreteRegister: (operands at: 2).
self rotateable8bitImmediate: offset
+ ifTrue:
+ [ :rot :immediate |
- ifTrue: [ :rot :immediate |
self machineCodeAt: 0
"add destReg, srcReg, #immediate ROR rot"
put: (self add: destReg rn: srcReg imm: immediate ror: rot<<1).
^machineCodeSize := 4]
+ ifFalse:
+ [instrOffset := self at: 0 moveCw: offset intoR: ConcreteIPReg.
+ "add destReg, srcReg, ConcreteIPReg"
+ self machineCodeAt: 16 put: (self add: destReg rn: srcReg rm: ConcreteIPReg).
- ifFalse: [
- instrOffset := self at: 0 moveCw: offset intoR: RISCTempReg.
- "add destReg, srcReg, RISCTempReg"
- self machineCodeAt: 16 put: (self add: destReg rn: srcReg rm: RISCTempReg).
^machineCodeSize := instrOffset + 4 ]!
Item was changed:
----- Method: CogARMCompiler>>concretizeLongCall (in category 'generate machine code - concretize') -----
concretizeLongCall
"Will get inlined into concretizeAt: switch."
"Sizing/generating calls.
Jump targets can be to absolute addresses or other abstract instructions.
Generating initial trampolines instructions may have no maxSize and be to absolute addresses.
Otherwise instructions must have a machineCodeSize which must be kept to."
<inline: true>
| jumpTarget instrOffset|
<var: #jumpTarget type: #'AbstractInstruction *'>
jumpTarget := self longJumpTargetAddress.
+ instrOffset := self at: 0 moveCw: jumpTarget intoR: ConcreteIPReg.
+ "blx ConcreteIPReg"
+ self machineCodeAt: instrOffset put: (self blx: ConcreteIPReg).
- instrOffset := self at: 0 moveCw: jumpTarget intoR: RISCTempReg.
- "blx RISCTempReg"
- self machineCodeAt: instrOffset put: (self blx: RISCTempReg).
^machineCodeSize := instrOffset + 4!
Item was changed:
----- Method: CogARMCompiler>>concretizeMoveAwR (in category 'generate machine code - concretize') -----
concretizeMoveAwR
"Will get inlined into concretizeAt: switch."
<inline: true>
| srcAddr destReg instrOffset|
srcAddr := operands at: 0.
destReg := self concreteRegister: (operands at: 1).
+ (self isAddressRelativeToVarBase: srcAddr) ifTrue:
+ [self machineCodeAt: 0 put: (self ldr: destReg rn: ConcreteVarBaseReg plusImm: srcAddr - cogit varBaseAddress).
+ ^machineCodeSize := 4].
+ "load the address into ConcreteIPReg"
+ instrOffset := self at: 0 moveCw: srcAddr intoR: ConcreteIPReg.
- "load the address into RISCTempReg"
- instrOffset := self at: 0 moveCw: srcAddr intoR: RISCTempReg.
"We *could* overwrite the last instruction above with a LDR a, b, last-byte-of-srcAddr BUT that would break if we change to loading literals instead of forming long constants"
+ self machineCodeAt: instrOffset put: (self ldr: destReg rn: ConcreteIPReg plusImm: 0).
- self machineCodeAt: instrOffset put: (self ldr: destReg rn: RISCTempReg plusImm: 0).
^machineCodeSize := instrOffset + 4!
Item was changed:
----- Method: CogARMCompiler>>concretizeMoveM16rR (in category 'generate machine code - concretize') -----
concretizeMoveM16rR
"Will get inlined into concretizeAt: switch."
"ldrh destReg, [srcReg, #immediate],
or
+ move offset to ConcreteIPReg
+ ldrh destReg, [srcReg, ConcreteIPReg]"
- move offset to RISCTempReg
- ldrh destReg, [srcReg, RISCTempReg]"
<inline: true>
| srcReg offset destReg instrOffset|
offset := operands at: 0.
srcReg := self concreteRegister: (operands at: 1).
destReg := self concreteRegister: (operands at: 2).
self is8BitValue: offset
+ ifTrue:
+ [ :u :immediate |
+ self machineCodeAt: 0 "ldrh destReg, [srcReg, #immediate]"
- ifTrue: [ :u :immediate |
- self machineCodeAt: 0
- "ldrh destReg, [srcReg, #immediate]"
put: (self ldrh: destReg rn: srcReg plus: u imm: immediate).
^machineCodeSize := 4]
+ ifFalse:
+ [instrOffset := self at: 0 moveCw: offset intoR: ConcreteIPReg.
+ "ldrh destReg, [srcReg, ConcreteIPReg]"
+ self machineCodeAt: instrOffset put: (self ldrh: destReg rn: srcReg rm: ConcreteIPReg).
- ifFalse: [
- instrOffset := self at: 0 moveCw: offset intoR: RISCTempReg.
- "ldrh destReg, [srcReg, RISCTempReg]"
- self machineCodeAt: instrOffset put: (self ldrh: destReg rn: srcReg rm: RISCTempReg).
^machineCodeSize := instrOffset + 4 ]!
Item was changed:
----- Method: CogARMCompiler>>concretizeMoveMbrR (in category 'generate machine code - concretize') -----
concretizeMoveMbrR
"Will get inlined into concretizeAt: switch."
+ "ldrb destReg, [srcReg, #immediate] or ldrb destReg, [srcReg, ConcreteIPReg]"
- "ldrb destReg, [srcReg, #immediate] or ldrb destReg, [srcReg, RISCTempReg]"
<inline: true>
| srcReg offset destReg instrOffset|
offset := operands at: 0.
srcReg := self concreteRegister: (operands at: 1).
destReg := self concreteRegister: (operands at: 2).
self is12BitValue: offset
+ ifTrue:
+ [ :u :immediate |
+ self machineCodeAt: 0 "ldrb destReg, [srcReg, #immediate]"
- ifTrue: [ :u :immediate |
- self machineCodeAt: 0
- "ldrb destReg, [srcReg, #immediate]"
put: (self ldrb: destReg rn: srcReg plus: u imm: immediate).
^machineCodeSize := 4]
+ ifFalse:
+ [instrOffset := self at: 0 moveCw: offset intoR: ConcreteIPReg.
+ "ldrb destReg, [srcReg, ConcreteIPReg]"
+ self machineCodeAt: instrOffset put: (self ldrb: destReg rn: srcReg rm: ConcreteIPReg).
- ifFalse: [
- instrOffset := self at: 0 moveCw: offset intoR: RISCTempReg.
- "ldrb destReg, [srcReg, RISCTempReg]"
- self machineCodeAt: instrOffset put: (self ldrb: destReg rn: srcReg rm: RISCTempReg).
^machineCodeSize := instrOffset + 4 ]!
Item was changed:
----- Method: CogARMCompiler>>concretizeMoveMwrR (in category 'generate machine code - concretize') -----
concretizeMoveMwrR
"Will get inlined into concretizeAt: switch."
<inline: true>
| srcReg offset destReg instrOffset|
offset := operands at: 0.
srcReg := self concreteRegister: (operands at: 1).
destReg := self concreteRegister: (operands at: 2).
self is12BitValue: offset
+ ifTrue:
+ [ :u :immediate |
+ self machineCodeAt: 0 "ldr destReg, [srcReg, #immediate]"
- ifTrue: [ :u :immediate |
- self machineCodeAt: 0
- "ldr destReg, [srcReg, #immediate]"
put: (self ldr: destReg rn: srcReg plus: u imm: immediate).
^machineCodeSize := 4]
+ ifFalse:
+ [instrOffset := self at: 0 moveCw: offset intoR: ConcreteIPReg.
+ "ldr destReg, [srcReg, ConcreteIPReg]"
+ self machineCodeAt: instrOffset put: (self ldr: destReg rn: srcReg rm: ConcreteIPReg).
+ ^machineCodeSize := instrOffset + 4]!
- ifFalse: [
- instrOffset := self at: 0 moveCw: offset intoR: RISCTempReg.
- "ldr destReg, [srcReg, RISCTempReg]"
- self machineCodeAt: instrOffset put: (self ldr: destReg rn: srcReg rm: RISCTempReg).
- ^machineCodeSize := instrOffset +4 ]!
Item was changed:
----- Method: CogARMCompiler>>concretizeMoveRAw (in category 'generate machine code - concretize') -----
concretizeMoveRAw
"Will get inlined into concretizeAt: switch."
+ "LEA ConcreteIPReg
+ str srcReg, [ConcreteIPReg]"
- "LEA RISCTempReg
- str srcReg, [RISCTempReg]"
<inline: true>
| srcReg destAddr instrOffset|
srcReg := self concreteRegister: (operands at: 0).
destAddr := operands at: 1.
+ (self isAddressRelativeToVarBase: destAddr) ifTrue:
+ [self machineCodeAt: 0 put: (self str: srcReg rn: ConcreteVarBaseReg plusImm: destAddr - cogit varBaseAddress).
+ ^machineCodeSize := 4].
+ "load the address into ConcreteIPReg"
+ instrOffset := self at: 0 moveCw: destAddr intoR: ConcreteIPReg.
- "load the address into RISCTempReg"
- instrOffset := self at: 0 moveCw: destAddr intoR: RISCTempReg.
"We *could* overwrite the last instruction above with a LDR a, b, last-byte-of-srcAddr BUT that would break if we change to loading literals instead of forming long constants"
+ self machineCodeAt: instrOffset put: (self str: srcReg rn: ConcreteIPReg plusImm: 0).
- self machineCodeAt: instrOffset put: (self str: srcReg rn: RISCTempReg plusImm: 0).
^machineCodeSize := instrOffset + 4!
Item was changed:
----- Method: CogARMCompiler>>concretizeMoveRMbr (in category 'generate machine code - concretize') -----
concretizeMoveRMbr
"Will get inlined into concretizeAt: switch."
<inline: true>
| srcReg offset baseReg instrOffset|
srcReg := self concreteRegister: (operands at: 0).
offset := operands at: 1.
baseReg := self concreteRegister: (operands at: 2).
self is12BitValue: offset
+ ifTrue:
+ [ :u :immediate |
+ self machineCodeAt: 0 "strb srcReg, [baseReg, #immediate]"
- ifTrue: [ :u :immediate |
- self machineCodeAt: 0
- "strb srcReg, [baseReg, #immediate]"
put: (self strb: srcReg rn: baseReg plus: u imm: immediate).
^machineCodeSize := 4]
+ ifFalse:
+ [instrOffset := self at: 0 moveCw: offset intoR: ConcreteIPReg.
+ "strb srcReg, [baseReg, ConcreteIPReg]"
+ self machineCodeAt: instrOffset put: (self strb: srcReg rn: baseReg rm: ConcreteIPReg).
- ifFalse: [
- instrOffset := self at: 0 moveCw: offset intoR: RISCTempReg.
- "strb srcReg, [baseReg, RISCTempReg]"
- self machineCodeAt: instrOffset put: (self strb: srcReg rn: baseReg rm: RISCTempReg).
^machineCodeSize := instrOffset + 4 ]!
Item was changed:
----- Method: CogARMCompiler>>concretizeMoveRMwr (in category 'generate machine code - concretize') -----
concretizeMoveRMwr
"Will get inlined into concretizeAt: switch."
<inline: true>
| srcReg offset baseReg instrOffset|
srcReg := self concreteRegister: (operands at: 0).
offset := operands at: 1.
baseReg := self concreteRegister: (operands at: 2).
self is12BitValue: offset
+ ifTrue:
+ [ :u :immediate |
+ self machineCodeAt: 0 "str srcReg, [baseReg, #immediate]"
- ifTrue: [ :u :immediate |
- self machineCodeAt: 0
- "str srcReg, [baseReg, #immediate]"
put: (self str: srcReg rn: baseReg plus: u imm: immediate).
^machineCodeSize := 4]
+ ifFalse:
+ [instrOffset := self at: 0 moveCw: offset intoR: ConcreteIPReg.
+ "str srcReg, [baseReg, ConcreteIPReg]"
+ self machineCodeAt: instrOffset put: (self str: srcReg rn: baseReg rm: ConcreteIPReg).
+ ^machineCodeSize := instrOffset + 4]!
- ifFalse: [
- instrOffset := self at: 0 moveCw: offset intoR: RISCTempReg.
- "str srcReg, [baseReg, RISCTempReg]"
- self machineCodeAt: instrOffset put: (self str: srcReg rn: baseReg rm: RISCTempReg).
- ^machineCodeSize := instrOffset + 4 ]!
Item was changed:
----- Method: CogARMCompiler>>concretizePrefetchAw (in category 'generate machine code - concretize') -----
concretizePrefetchAw
"Will get inlined into concretizeAt: switch."
<inline: true>
| addressOperand instrOffset|
addressOperand := operands at: 0.
+ (self isAddressRelativeToVarBase: addressOperand) ifTrue:
+ [self machineCodeAt: 0 put: (self pld: ConcreteVarBaseReg plus: 1 offset: addressOperand - cogit varBaseAddress).
+ ^machineCodeSize := 4].
+ instrOffset := self at: 0 moveCw: addressOperand intoR: ConcreteIPReg.
+ "pld [ConcreteIPReg]"
+ self machineCodeAt: instrOffset put: (self pld: ConcreteIPReg plus: 1offset: 0).
- instrOffset := self at: 0 moveCw: addressOperand intoR: RISCTempReg.
- "pld [RISCTempReg]"
- self machineCodeAt: instrOffset put: (self pld: RISCTempReg plus: 1offset: 0).
^machineCodeSize := instrOffset + 4!
Item was changed:
----- Method: CogARMCompiler>>concretizePushCw (in category 'generate machine code - concretize') -----
concretizePushCw
"Will get inlined into concretizeAt: switch."
<inline: true>
| word instrOffset|
word := operands at: 0.
+ instrOffset := self at: 0 moveCw: word intoR: ConcreteIPReg.
+ self machineCodeAt: instrOffset put: (self pushR: ConcreteIPReg).
- instrOffset := self at: 0 moveCw: word intoR: RISCTempReg.
- self machineCodeAt: instrOffset put: (self pushR: RISCTempReg).
^machineCodeSize := instrOffset + 4!
Item was changed:
----- Method: CogARMCompiler>>dispatchConcretize (in category 'generate machine code') -----
dispatchConcretize
"Attempt to generate concrete machine code for the instruction at address.
This is the inner dispatch of concretizeAt: actualAddress which exists only
to get around the branch size limits in the SqueakV3 (blue book derived)
bytecode set."
<returnTypeC: #void>
cond ifNotNil:
[self concretizeConditionalInstruction.
^self].
opcode caseOf: {
"Noops & Pseudo Ops"
[Label] -> [^self concretizeLabel].
[AlignmentNops] -> [^self concretizeAlignmentNops].
[Fill16] -> [^self concretizeFill16].
[Fill32] -> [^self concretizeFill32].
[FillFromWord] -> [^self concretizeFillFromWord].
[Nop] -> [^self concretizeNop].
"Control"
[Call] -> [^self concretizeCall].
[JumpR] -> [^self concretizeJumpR].
[JumpLong] -> [^self concretizeConditionalJumpLong: AL].
[JumpLongZero] -> [^self concretizeConditionalJumpLong: EQ].
[JumpLongNonZero] -> [^self concretizeConditionalJumpLong: NE].
[Jump] -> [^self concretizeConditionalJump: AL].
[JumpZero] -> [^self concretizeConditionalJump: EQ].
[JumpNonZero] -> [^self concretizeConditionalJump: NE].
[JumpNegative] -> [^self concretizeConditionalJump: MI].
[JumpNonNegative] -> [^self concretizeConditionalJump: PL].
[JumpOverflow] -> [^self concretizeConditionalJump: VS].
[JumpNoOverflow] -> [^self concretizeConditionalJump: VC].
[JumpCarry] -> [^self concretizeConditionalJump: CS].
[JumpNoCarry] -> [^self concretizeConditionalJump: CC].
[JumpLess] -> [^self concretizeConditionalJump: LT].
[JumpGreaterOrEqual] -> [^self concretizeConditionalJump: GE].
[JumpGreater] -> [^self concretizeConditionalJump: GT].
[JumpLessOrEqual] -> [^self concretizeConditionalJump: LE].
[JumpBelow] -> [^self concretizeConditionalJump: CC]. "unsigned lower"
[JumpAboveOrEqual] -> [^self concretizeConditionalJump: CS]. "unsigned greater or equal"
[JumpAbove] -> [^self concretizeConditionalJump: HI].
[JumpBelowOrEqual] -> [^self concretizeConditionalJump: LS].
[JumpFPEqual] -> [^self concretizeFPConditionalJump: EQ].
[JumpFPNotEqual] -> [^self concretizeFPConditionalJump: NE].
"[JumpFPLess] -> [^self concretizeFPConditionalJump: LT].
[JumpFPGreaterOrEqual] -> [^self concretizeFPConditionalJump: GE].
[JumpFPGreater] -> [^self concretizeFPConditionalJump: GT].
[JumpFPLessOrEqual] -> [^self concretizeFPConditionalJump: LE].
[JumpFPOrdered] -> [^self concretizeFPConditionalJump: VC].
[JumpFPUnordered] -> [^self concretizeFPConditionalJump: VS]."
[RetN] -> [^self concretizeRetN].
"Arithmetic"
[AddCqR] -> [^self concretizeAddCqR].
[AddCwR] -> [^self concretizeDataOperationCwR: AddOpcode].
[AddRR] -> [^self concretizeDataOperationRR: AddOpcode].
"[AddRdRd] -> [^self concretizeSEE2OpRdRd: 16r58]."
[AndCqR] -> [^self concretizeAndCqR].
+ [AndCqRR] -> [^self concretizeAndCqRR].
[AndCwR] -> [^self concretizeDataOperationCwR: AndOpcode].
[AndRR] -> [^self concretizeDataOperationRR: AndOpcode].
[BICCqR] -> [^self concretizeDataOperationCqR: BicOpcode].
[CmpCqR] -> [^self concretizeDataOperationCqR: CmpOpcode].
[CmpCwR] -> [^self concretizeDataOperationCwR: CmpOpcode].
[CmpRR] -> [^self concretizeDataOperationRR: CmpOpcode].
[CmpRdRd] -> [^self concretizeCmpRdRd].
"[DivRdRd] -> [^self concretizeSEE2OpRdRd: 16r5E].
[MulRdRd] -> [^self concretizeSEE2OpRdRd: 16r59]."
[OrCqR] -> [^self concretizeDataOperationCqR: OrOpcode].
[OrCwR] -> [^self concretizeDataOperationCwR: OrOpcode].
[OrRR] -> [^self concretizeDataOperationRR: OrOpcode].
[SubCqR] -> [^self concretizeSubCqR].
[SubCwR] -> [^self concretizeDataOperationCwR: SubOpcode].
[SubRR] -> [^self concretizeDataOperationRR: SubOpcode].
"[SubRdRd] -> [^self concretizeSEE2OpRdRd: 16r5C]."
[SqrtRd] -> [^self concretizeSqrtRd].
[TstCqR] -> [^self concretizeTstCqR].
[XorCqR] -> [^self concretizeDataOperationCqR: XorOpcode].
[XorCwR] -> [^self concretizeDataOperationCwR: XorOpcode].
[XorRR] -> [^self concretizeDataOperationRR: XorOpcode].
[NegateR] -> [^self concretizeNegateR].
[LoadEffectiveAddressMwrR] -> [^self concretizeLoadEffectiveAddressMwrR].
[ArithmeticShiftRightCqR] -> [^self concretizeArithmeticShiftRightCqR].
[LogicalShiftRightCqR] -> [^self concretizeLogicalShiftRightCqR].
[LogicalShiftLeftCqR] -> [^self concretizeLogicalShiftLeftCqR].
[ArithmeticShiftRightRR] -> [^self concretizeArithmeticShiftRightRR].
[LogicalShiftLeftRR] -> [^self concretizeLogicalShiftLeftRR].
[LogicalShiftRightRR] -> [^self concretizeLogicalShiftRightRR].
"Data Movement"
[MoveCqR] -> [^self concretizeMoveCqR].
[MoveCwR] -> [^self concretizeMoveCwR].
[MoveRR] -> [^self concretizeMoveRR].
[MoveAwR] -> [^self concretizeMoveAwR].
[MoveRAw] -> [^self concretizeMoveRAw].
"While the two MoveMbR and MoveMwR are quite similar (off by 1 bit), they differ way more to
MoveM16R and MoveM64R. Because of that, they are not merged."
[MoveMbrR] -> [^self concretizeMoveMbrR].
[MoveRMbr] -> [^self concretizeMoveRMbr].
[MoveM16rR] -> [^self concretizeMoveM16rR].
[MoveM64rRd] -> [^self concretizeMoveM64rRd].
[MoveMwrR] -> [^self concretizeMoveMwrR].
[MoveXbrRR] -> [^self concretizeMoveXbrRR].
[MoveRXbrR] -> [^self concretizeMoveRXbrR].
[MoveXwrRR] -> [^self concretizeMoveXwrRR].
[MoveRXwrR] -> [^self concretizeMoveRXwrR].
[MoveRMwr] -> [^self concretizeMoveRMwr].
[MoveRdM64r] -> [^self concretizeMoveRdM64r].
[PopR] -> [^self concretizePopR].
[PushR] -> [^self concretizePushR].
[PushCw] -> [^self concretizePushCw].
[PrefetchAw] -> [^self concretizePrefetchAw].
"Conversion"
[ConvertRRd] -> [^self concretizeConvertRRd].
"ARM specific opcodes"
[LDMFD] -> [^self concretizeLDMFD].
[STMFD] -> [^self concretizeSTMFD].
[SMULL] -> [^self concretizeSMULL] }!
Item was added:
+ ----- Method: CogARMCompiler>>hasThreeAddressArithmetic (in category 'testing') -----
+ hasThreeAddressArithmetic
+ "Answer if the receiver supports three-address arithmetic instructions (currently only AndCqRR)"
+ <inline: true>
+ ^true!
Item was added:
+ ----- Method: CogARMCompiler>>hasVarBaseRegister (in category 'testing') -----
+ hasVarBaseRegister
+ "Answer if the processor has a dedicated callee-saved register to point to
+ the base of commonly-accessed variables. On ARM we use R10 for this."
+ <inline: true>
+ ^true "r10/sl"!
Item was removed:
- ----- Method: CogARMCompiler>>instructionIsAnyB: (in category 'testing') -----
- instructionIsAnyB: instr
- "is this any of the B BX BL or BLX <offset> instructions?"
- ^(instr >> 25 bitAnd: 7) = 5!
Item was added:
+ ----- Method: CogARMCompiler>>isAddressRelativeToVarBase: (in category 'testing') -----
+ isAddressRelativeToVarBase: address
+ ^address notNil
+ and: [address >= cogit varBaseAddress
+ and: [address - cogit varBaseAddress < (1 << 12)]]!
Item was added:
+ ----- Method: CogARMCompiler>>maybeEstablishVarBase (in category 'abstract instructions') -----
+ maybeEstablishVarBase
+ "The receiver has a VarBaseReg; generate the code to set it to its value."
+ cogit MoveCq: cogit varBaseAddress R: VarBaseReg!
Item was removed:
- ----- Method: CogARMCompiler>>riscTempReg (in category 'accessing') -----
- riscTempReg
- ^RISCTempReg!
Item was removed:
- ----- Method: CogAbstractInstruction>>callsAreRelative (in category 'testing') -----
- callsAreRelative
- ^self subclassResponsibility!
Item was changed:
----- Method: CogAbstractInstruction>>canDivQuoRem (in category 'testing') -----
canDivQuoRem
+ <inline: true>
^self subclassResponsibility!
Item was changed:
----- Method: CogAbstractInstruction>>canMulRR (in category 'testing') -----
canMulRR
+ <inline: true>
^self subclassResponsibility!
Item was added:
+ ----- Method: CogAbstractInstruction>>hasThreeAddressArithmetic (in category 'testing') -----
+ hasThreeAddressArithmetic
+ "Answer if the receiver supports three-address arithmetic instructions (currently only AndCqRR)"
+ <inline: true>
+ ^self subclassResponsibility!
Item was added:
+ ----- Method: CogAbstractInstruction>>hasVarBaseRegister (in category 'testing') -----
+ hasVarBaseRegister
+ "Answer if the processor has a dedicated callee-saved register to point to
+ the base of commonly-accessed variables. By default this is false."
+ <inline: true>
+ ^false!
Item was added:
+ ----- Method: CogAbstractInstruction>>maybeEstablishVarBase (in category 'abstract instructions') -----
+ maybeEstablishVarBase
+ "If the receiver has a VarBaseReg, generate the code to set it to its value."
+ self subclassResponsibility!
Item was removed:
- ----- Method: CogIA32Compiler>>callsAreRelative (in category 'testing') -----
- callsAreRelative
- ^true!
Item was changed:
----- Method: CogIA32Compiler>>canDivQuoRem (in category 'testing') -----
canDivQuoRem
+ <inline: true>
^true!
Item was changed:
----- Method: CogIA32Compiler>>canMulRR (in category 'testing') -----
canMulRR
+ <inline: true>
^true!
Item was added:
+ ----- Method: CogIA32Compiler>>hasThreeAddressArithmetic (in category 'testing') -----
+ hasThreeAddressArithmetic
+ "Answer if the receiver supports three-address arithmetic instructions"
+ <inline: true>
+ ^false!
Item was added:
+ ----- Method: CogIA32Compiler>>maybeEstablishVarBase (in category 'abstract instructions') -----
+ maybeEstablishVarBase
+ "The receiver does not have a VarBaseReg; do nothing."!
Item was changed:
----- Method: CogObjectRepresentationFor32BitSpur>>genGetInlineCacheClassTagFrom:into:forEntry: (in category 'compile abstract instructions') -----
genGetInlineCacheClassTagFrom: sourceReg into: destReg forEntry: forEntry
"Extract the inline cache tag for the object in sourceReg into destReg. The inline
cache tag for a given object is the value loaded in inline caches to distinguish
objects of different classes. In Spur this is either the tags for immediates, (with
1 & 3 collapsed to 1 for SmallIntegers, and 2 collapsed to 0 for Characters), or
the receiver's classIndex.
If forEntry is true answer the entry label at which control is to enter (cmEntryOffset).
If forEntry is false, control enters at the start.
If forEntry is false, generate something like this:
Limm:
andl $0x1, rDest
j Lcmp
Lentry:
movl rSource, rDest
andl $0x3, rDest
jnz Limm
movl 0(%edx), rDest
andl $0x3fffff, rDest
Lcmp:
If forEntry is true, generate something like the following.
At least on a 2.2GHz Intel Core i7 the following is slightly faster than the above,
136m sends/sec vs 130m sends/sec for nfib in tinyBenchmarks
Lentry:
movl rSource, rDest
andl $0x3, rDest
jz LnotImm
andl $1, rDest
j Lcmp
LnotImm:
movl 0(%edx), rDest
andl $0x3fffff, rDest
Lcmp:
But we expect most SmallInteger arithmetic to be performed in-line and so prefer the
version that is faster for non-immediates (because it branches for immediates only)."
| immLabel jumpNotImm entryLabel jumpCompare |
<var: #immLabel type: #'AbstractInstruction *'>
<var: #jumpNotImm type: #'AbstractInstruction *'>
<var: #entryLabel type: #'AbstractInstruction *'>
<var: #jumpCompare type: #'AbstractInstruction *'>
forEntry
ifFalse:
[entryLabel := cogit Label.
+ cogit AndCq: objectMemory tagMask R: sourceReg R: destReg.
- cogit MoveR: sourceReg R: destReg.
- cogit AndCq: objectMemory tagMask R: destReg.
jumpNotImm := cogit JumpZero: 0.
cogit AndCq: 1 R: destReg.
jumpCompare := cogit Jump: 0.
"Get least significant half of header word in destReg"
self flag: #endianness.
jumpNotImm jmpTarget:
(cogit MoveMw: 0 r: sourceReg R: destReg).
jumpCompare jmpTarget:
(cogit AndCq: objectMemory classIndexMask R: destReg)]
ifTrue:
[cogit AlignmentNops: objectMemory wordSize.
immLabel := cogit Label.
cogit AndCq: 1 R: destReg.
jumpCompare := cogit Jump: 0.
cogit AlignmentNops: objectMemory wordSize.
entryLabel := cogit Label.
+ cogit AndCq: objectMemory tagMask R: sourceReg R: destReg.
- cogit MoveR: sourceReg R: destReg.
- cogit AndCq: objectMemory tagMask R: destReg.
cogit JumpNonZero: immLabel.
self flag: #endianness.
"Get least significant half of header word in destReg"
cogit MoveMw: 0 r: sourceReg R: destReg.
cogit AndCq: objectMemory classIndexMask R: destReg.
jumpCompare jmpTarget: cogit Label].
^entryLabel!
Item was changed:
SharedPool subclass: #CogRTLOpcodes
instanceVariableNames: ''
+ classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCqRR AndCwR AndRR Arg0Reg Arg1Reg ArithmeticShiftRightCqR ArithmeticShiftRightRR Call ClassReg CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 DivRdRd FPReg Fill16 Fill32 Fill8 FillBytesFrom FillFromWord FirstJump FirstShortJump GPRegMax GPRegMin Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode LinkReg LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM32rR MoveM64rRd MoveMbrR MoveMwrR MoveRAb MoveRAw MoveRM16r MoveRM32r MoveRMbr MoveRMwr MoveRR MoveRX16rR MoveRX32rR MoveRXbrR MoveRXowr MoveRXwrR MoveRdM64r MoveRdRd MoveX16rRR MoveX32rRR MoveXbrRR MoveXowrR MoveXwrRR MulCqR MulCwR MulRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PCReg PopR PrefetchAw PushCw PushR RISCTempReg ReceiverResultReg RetN SPReg SendNumArgsReg SqrtRd SubCqR SubCwR SubRR SubRdRd TempReg TstCqR VarBaseReg XorCqR XorCwR XorRR'
- classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCwR AndRR Arg0Reg Arg1Reg ArithmeticShiftRightCqR ArithmeticShiftRightRR Call ClassReg CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 DivRdRd FPReg Fill16 Fill32 Fill8 FillBytesFrom FillFromWord FirstJump FirstShortJump GPRegMax GPRegMin Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode LinkReg LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM32rR MoveM64rRd MoveMbrR MoveMwrR MoveRAb MoveRAw MoveRM16r MoveRM32r MoveRMbr MoveRMwr MoveRR MoveRX16rR MoveRX32rR MoveRXbrR MoveRXowr MoveRXwrR MoveRdM64r MoveRdRd MoveX16rRR MoveX32rRR MoveXbrRR MoveXowrR MoveXwrRR MulCqR MulCwR MulRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PCReg PopR PrefetchAw PushCw PushR RISCTempReg ReceiverResultReg RetN SPReg SendNumArgsReg SqrtRd SubCqR SubCwR SubRR SubRdRd TempReg TstCqR XorCqR XorCwR XorRR'
poolDictionaries: ''
category: 'VMMaker-JIT'!
!CogRTLOpcodes commentStamp: '<historical>' prior: 0!
I am a pool for the Register-Transfer-Language to which Cog compiles. I define unique integer values for all RTL opcodes and abstract registers. See CogAbstractInstruction for instances of instructions with the opcodes that I define.!
Item was changed:
----- Method: CogRTLOpcodes class>>initialize (in category 'class initialization') -----
initialize
"Abstract opcodes are a compound of a one word operation specifier and zero or more operand type specifiers.
e.g. MoveRR is the Move opcode with two register operand specifiers and defines a move register to
register instruction from operand 0 to operand 1. The word and register size is assumed to be either 32-bits on
+ a 32-bit architecture or 64-bits on a 64-bit architecture. The abstract machine is mostly a 2 address machine
+ with the odd three address instruction added to better exploit RISCs.
+ (self initialize)
- a 32-bit architecture or 64-bits on a 64-bit architecture. (self initialize)
The operand specifiers are
R - general purpose register
Rd - double-precision floating-point register
+ Cq - a `quick' constant that can be encoded in the minimum space possible.
- Cq - a quick constant that can be encoded in the minimum space possible.
Cw - a constant with word size where word is the default operand size for the Smalltalk VM, 32-bits
for a 32-bit VM, 64-bits for a 64-bit VM. The generated constant must occupy the default number
of bits. This allows e.g. a garbage collector to update the value without invalidating the code.
C32 - a constant with 32 bit size. The generated constant must occupy 32 bits.
C64 - a constant with 64 bit size. The generated constant must occupy 64 bits.
+ Aw - memory word at an absolute address
+ Ab - memory byte at an absolute address
- Aw - memory word with an absolute address
- Ab - memory byte with an absolute address
Mwr - memory word whose address is at a constant offset from an address in a register
Mbr - memory byte whose address is at a constant offset from an address in a register
M16r - memory 16-bit halfword whose address is at a constant offset from an address in a register
M32r - memory 32-bit halfword whose address is at a constant offset from an address in a register
M64r - memory 64-bit doubleword whose address is at a constant offset from an address in a register
XbrR - memory word whose address is r * byte size away from an address in a register
X16rR - memory word whose address is r * (2 bytes size) away from an address in a register
XwrR - memory word whose address is r * word size away from an address in a register
XowrR - memory word whose address is (r * word size) + o away from an address in a register (scaled indexed)
An alternative would be to decouple opcodes from operands, e.g.
Move := 1. Add := 2. Sub := 3...
RegisterOperand := 1. ConstantQuickOperand := 2. ConstantWordOperand := 3...
But not all combinations make sense and even fewer are used so we stick with the simple compound approach.
The assumption is that comparison and arithmetic instructions set condition codes and that move instructions
leave the condition codes unaffected. In particular LoadEffectiveAddressMwrR does not set condition codes
although it can be used to do arithmetic.
Not all of the definitions in opcodeDefinitions below are implemented. In particular we do not implement the
XowrR scaled index addressing mode since it requires 4 operands.
Note that there are no generic division instructions defined, but a processor may define some."
| opcodeNames refs |
+ self flag: 'GPRegMin and GPRegMax are poorly thought-out and should instead defer to the backEnd for allocateable registers.'.
+ "A small fixed set of abstract registers are defined and used in code generation
+ for Smalltalk code, and executes on stack pages in the stack zone.
+ These are mapped to processor-specific registers by concreteRegister:"
+ FPReg := -1. "A frame pointer is used for Smalltalk frames."
- FPReg := -1.
SPReg := -2.
+ ReceiverResultReg := GPRegMax := -3. "The receiver at point of send, and return value from a send"
- ReceiverResultReg := GPRegMax := -3.
TempReg := -4.
+ ClassReg := -5. "The inline send cache class tag is in this register, loaded at the send site"
+ SendNumArgsReg := -6. "Sends > 2 args set the arg count in this reg"
+ Arg0Reg := -7. "In the StackToregisterMappingCogit 1 & 2 arg sends marshall into these registers."
- ClassReg := -5.
- SendNumArgsReg := -6.
- Arg0Reg := -7.
Arg1Reg := GPRegMin := -8.
+ "Floating-point registers"
DPFPReg0 := -9.
DPFPReg1 := -10.
DPFPReg2 := -11.
DPFPReg3 := -12.
DPFPReg4 := -13.
DPFPReg5 := -14.
DPFPReg6 := -15.
DPFPReg7 := -16.
+
+ "RISC-specific"
-
LinkReg := -17.
+ RISCTempReg := -18.
+ PCReg := -19.
+ VarBaseReg := -20. "If useful, points to base of interpreter variables."
- PCReg := -18.
opcodeNames := #("Noops & Pseudo Ops"
Label
AlignmentNops
FillBytesFrom "output operand 0's worth of bytes from the address in operand 1"
Fill8 "output a byte's worth of bytes with operand 0"
Fill16 "output two byte's worth of bytes with operand 0"
Fill32 "output four byte's worth of bytes with operand 0"
FillFromWord "output BytesPerWord's worth of bytes with operand 0 + operand 1"
Nop
"Control"
Call
RetN
JumpR "Not a regular jump, i.e. not pc dependent."
"N.B. Jumps are contiguous. Long jumps are contigiuous within them. See FirstJump et al below"
JumpLong
JumpLongZero "a.k.a. JumpLongEqual"
JumpLongNonZero "a.k.a. JumpLongNotEqual"
Jump
JumpZero "a.k.a. JumpEqual"
JumpNonZero "a.k.a. JumpNotEqual"
JumpNegative
JumpNonNegative
JumpOverflow
JumpNoOverflow
JumpCarry
JumpNoCarry
JumpLess "signed"
JumpGreaterOrEqual
JumpGreater
JumpLessOrEqual
JumpBelow "unsigned"
JumpAboveOrEqual
JumpAbove
JumpBelowOrEqual
JumpFPEqual
JumpFPNotEqual
JumpFPLess
JumpFPLessOrEqual
JumpFPGreater
JumpFPGreaterOrEqual
JumpFPOrdered
JumpFPUnordered
"Data Movement; destination is always last operand"
MoveRR
MoveAwR
MoveRAw
MoveAbR
MoveRAb
MoveMwrR MoveRMwr MoveXwrRR MoveRXwrR MoveXowrR MoveRXowr
MoveM16rR MoveRM16r MoveX16rRR MoveRX16rR
MoveM32rR MoveRM32r MoveX32rRR MoveRX32rR
MoveMbrR MoveRMbr MoveXbrRR MoveRXbrR
MoveCqR MoveCwR MoveC32R MoveC64R
MoveRdRd MoveM64rRd MoveRdM64r
PopR PushR PushCw
PrefetchAw
"Arithmetic; destination is always last operand except Cmp; CmpXR is SubRX with no update of result"
LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR "Variants of add/multiply"
NegateR "2's complement negation"
ArithmeticShiftRightCqR ArithmeticShiftRightRR
LogicalShiftRightCqR LogicalShiftRightRR
LogicalShiftLeftCqR LogicalShiftLeftRR
CmpRR AddRR SubRR AndRR OrRR XorRR MulRR
CmpCqR AddCqR SubCqR AndCqR OrCqR XorCqR MulCqR
CmpCwR AddCwR SubCwR AndCwR OrCwR XorCwR MulCwR
+ AndCqRR
+
CmpRdRd AddRdRd SubRdRd MulRdRd DivRdRd TstCqR SqrtRd
"Conversion"
ConvertRRd
LastRTLCode).
"Magic auto declaration. Add to the classPool any new variables and nuke any obsolete ones, and assign values"
"Find the variables directly referenced by this method"
refs := (thisContext method literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect:
[:ea| ea key].
"Move to Undeclared any opcodes in classPool not in opcodes or this method."
(classPool keys reject: [:k| (opcodeNames includes: k) or: [refs includes: k]]) do:
[:k|
Undeclared declare: k from: classPool].
"Declare as class variables and number elements of opcodeArray above"
opcodeNames withIndexDo:
[:classVarName :value|
self classPool
declare: classVarName from: Undeclared;
at: classVarName put: value].
"For CogAbstractInstruction>>isJump etc..."
FirstJump := JumpLong.
LastJump := JumpFPUnordered.
FirstShortJump := Jump.
"And now initialize the backends; they add their own opcodes and hence these must be reinitialized."
(Smalltalk classNamed: #CogAbstractInstruction) ifNotNil:
[:cogAbstractInstruction| cogAbstractInstruction allSubclasses do: [:sc| sc initialize]]!
Item was changed:
----- Method: CogVMSimulator>>utilitiesMenu: (in category 'UI') -----
utilitiesMenu: aMenuMorph
aMenuMorph
add: 'toggle transcript' action: #toggleTranscript;
add: 'clone VM' action: #cloneSimulationWindow;
addLine;
add: 'print ext head frame' action: #printExternalHeadFrame;
add: 'print int head frame' action: #printHeadFrame;
add: 'print mc/cog frame' action: [self printFrame: cogit processor fp WithSP: cogit processor sp];
add: 'short print ext frame & callers' action: [self shortPrintFrameAndCallers: framePointer];
add: 'short print int frame & callers' action: [self shortPrintFrameAndCallers: localFP];
add: 'short print mc/cog frame & callers' action: [self shortPrintFrameAndCallers: cogit processor fp];
add: 'long print ext frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer];
add: 'long print int frame & callers' action: [self printFrameAndCallers: localFP SP: localSP];
add: 'long print mc/cog frame & callers' action: [self printFrameAndCallers: cogit processor fp SP: cogit processor sp];
add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]];
add: 'print call stack' action: #printCallStack;
add: 'print stack call stack' action: #printStackCallStack;
add: 'print stack call stack of...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printStackCallStackOf: fp]];
add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]];
add: 'print call stack of frame...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printCallStackFP: fp]];
add: 'print all stacks' action: #printAllStacks;
add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP.
self writeBackHeadFramePointers];
add: 'write back mc ptrs' action: [stackPointer := cogit processor sp. framePointer := cogit processor fp. instructionPointer := cogit processor eip.
self writeBackHeadFramePointers];
addLine;
add: 'print rump C stack' action: [objectMemory printMemoryFrom: cogit processor sp to: self CStackPointer];
add: 'print registers' action: [cogit processor printRegistersOn: transcript];
add: 'print register map' action: [cogit printRegisterMapOn: transcript];
add: 'disassemble method/trampoline...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit disassembleCodeAt: pc]];
add: 'disassemble method/trampoline at pc' action: [cogit disassembleCodeAt: cogit processor pc];
add: 'disassemble ext head frame method' action: [cogit disassembleMethod: (self frameMethod: framePointer)];
add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]];
add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]];
add: 'print context...' action: [(self promptHex: 'print context') ifNotNil: [:oop| self printContext: oop]];
addLine;
add: 'inspect object memory' target: objectMemory action: #inspect;
add: 'inspect cointerpreter' action: #inspect;
add: 'inspect cogit' target: cogit action: #inspect;
add: 'inspect method zone' target: cogit methodZone action: #inspect.
self isThreadedVM ifTrue:
[aMenuMorph add: 'inspect thread manager' target: self threadManager action: #inspect].
aMenuMorph
addLine;
add: 'print cog methods' target: cogMethodZone action: #printCogMethods;
add: 'print cog methods with prim...' action: [(self promptNum: 'prim index') ifNotNil: [:pix| cogMethodZone printCogMethodsWithPrimitive: pix]];
+ add: 'print cog methods with selector...' action:
+ [|s| s := UIManager default request: 'selector'.
+ s notEmpty ifTrue:
+ [s = 'nil' ifTrue: [s := nil].
+ cogMethodZone methodsDo:
+ [:m|
+ (s ifNil: [m selector = objectMemory nilObject]
+ ifNotNil: [(objectMemory numBytesOf: m selector) = s size
+ and: [(self str: s
+ n: (m selector + objectMemory baseHeaderSize)
+ cmp: (objectMemory numBytesOf: m selector)) = 0]]) ifTrue:
+ [cogit printCogMethod: m]]]];
add: 'print cog method for...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit printCogMethodFor: pc]];
add: 'print trampoline table' target: cogit action: #printTrampolineTable;
add: 'print prim trace log' action: #dumpPrimTraceLog;
add: 'report recent instructions' target: cogit action: #reportLastNInstructions;
add: 'set break pc (', (cogit breakPC isInteger ifTrue: [cogit breakPC hex] ifFalse: [cogit breakPC printString]), ')...' action: [(self promptHex: 'break pc') ifNotNil: [:bpc| cogit breakPC: bpc]];
add: (cogit singleStep
ifTrue: ['no single step']
ifFalse: ['single step'])
action: [cogit singleStep: cogit singleStep not];
add: (cogit printRegisters
ifTrue: ['no print registers each instruction']
ifFalse: ['print registers each instruction'])
action: [cogit printRegisters: cogit printRegisters not];
add: (cogit printInstructions
ifTrue: ['no print instructions each instruction']
ifFalse: ['print instructions each instruction'])
action: [cogit printInstructions: cogit printInstructions not];
addLine;
add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'.
s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]];
add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'.
s notEmpty ifTrue: [self setBreakSelector: s]];
add: 'set break block...' action: [|s| s := UIManager default request: 'break block' initialAnswer: '[:theCogit| false]'.
s notEmpty ifTrue: [self setBreakBlockFromString: s]];
add: 'set cogit break method...' action: [(self promptHex: 'cogit breakMethod') ifNotNil: [:bm| cogit setBreakMethod: bm]];
add: (printBytecodeAtEachStep
ifTrue: ['no print bytecode each bytecode']
ifFalse: ['print bytecode each bytecode'])
action: [self ensureDebugAtEachStepBlock.
printBytecodeAtEachStep := printBytecodeAtEachStep not];
add: (printFrameAtEachStep
ifTrue: ['no print frame each bytecode']
ifFalse: ['print frame each bytecode'])
action: [self ensureDebugAtEachStepBlock.
printFrameAtEachStep := printFrameAtEachStep not].
^aMenuMorph!
Item was added:
+ ----- Method: Cogit>>AndCq:R:R: (in category 'abstract instructions') -----
+ AndCq: quickConstant R: srcReg R: destReg
+ <inline: true>
+ <returnTypeC: #'AbstractInstruction *'>
+ | first |
+ <var: 'first' type: #'AbstractInstruction *'>
+ backEnd hasThreeAddressArithmetic ifTrue:
+ [^self gen: AndCqRR operand: quickConstant operand: srcReg operand: destReg].
+ first := self gen: MoveRR operand: srcReg operand: destReg.
+ self gen: AndCqR operand: quickConstant operand: destReg.
+ ^first!
Item was changed:
----- Method: Cogit>>ceCPICMiss:receiver: (in category 'in-line cacheing') -----
ceCPICMiss: cPIC receiver: receiver
"Code entry closed PIC miss. A send has fallen
through a closed (finite) polymorphic inline cache.
Either extend it or patch the send site to an open PIC.
The stack looks like:
receiver
args
sp=> sender return address"
<var: #cPIC type: #'CogMethod *'>
<api>
| outerReturn newTargetMethodOrNil errorSelectorOrNil cacheTag result |
self cCode: ''
inSmalltalk:
[cPIC isInteger ifTrue:
[^self ceCPICMiss: (self cogMethodSurrogateAt: cPIC) receiver: receiver]].
(objectMemory isOopForwarded: receiver) ifTrue:
[^coInterpreter ceSendFromInLineCacheMiss: cPIC].
outerReturn := coInterpreter stackTop.
self deny: (backEnd inlineCacheTagAt: outerReturn) = self picAbortDiscriminatorValue.
cPIC cPICNumCases < numPICCases
ifTrue:
[self lookup: cPIC selector
for: receiver
methodAndErrorSelectorInto:
[:method :errsel|
newTargetMethodOrNil := method.
errorSelectorOrNil := errsel]]
ifFalse: [newTargetMethodOrNil := errorSelectorOrNil := nil].
"We assume lookupAndCog:for: will *not* reclaim the method zone"
self assert: outerReturn = coInterpreter stackTop.
cacheTag := objectRepresentation inlineCacheTagForInstance: receiver.
(cPIC cPICNumCases >= numPICCases
or: [(errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand])
or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag)
or: [newTargetMethodOrNil isNil
or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue:
[result := self patchToOpenPICFor: cPIC selector
numArgs: cPIC cmNumArgs
receiver: receiver.
self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory"
^coInterpreter ceSendFromInLineCacheMiss: cPIC].
"Now extend the PIC with the new case."
self cogExtendPIC: cPIC
CaseNMethod: newTargetMethodOrNil
tag: cacheTag
isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand.
"Jump back into the pic at its entry in case this is an MNU."
coInterpreter
+ executeCogPIC: cPIC
- executeCogMethod: cPIC
fromLinkedSendWithReceiver: receiver
andCacheTag: (backEnd inlineCacheTagAt: outerReturn).
"NOTREACHED"
^nil!
Item was changed:
----- Method: Cogit>>ceSICMiss: (in category 'in-line cacheing') -----
ceSICMiss: receiver
"An in-line cache check in a method has failed. The failing entry check has jumped
to the ceMethodAbort abort call at the start of the method which has called this routine.
If possible allocate a closed PIC for the current and existing classes.
The stack looks like:
receiver
args
sender return address
sp=> ceMethodAbort call return address
So we can find the method that did the failing entry check at
ceMethodAbort call return address - missOffset
and we can find the send site from the outer return address."
<api>
| pic innerReturn outerReturn entryPoint targetMethod newTargetMethodOrNil errorSelectorOrNil cacheTag extent result |
<var: #pic type: #'CogMethod *'>
<var: #targetMethod type: #'CogMethod *'>
"Whether we can relink to a PIC or not we need to pop off the inner return and identify the target method."
innerReturn := coInterpreter popStack.
targetMethod := self cCoerceSimple: innerReturn - missOffset to: #'CogMethod *'.
(objectMemory isOopForwarded: receiver) ifTrue:
[^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
outerReturn := coInterpreter stackTop.
self assert: (outerReturn between: methodZoneBase and: methodZone freeStart).
entryPoint := backEnd callTargetFromReturnAddress: outerReturn.
self assert: targetMethod selector ~= objectMemory nilObject.
self cppIf: NewspeakVM ifTrue:
[self assert: (targetMethod asInteger + cmEntryOffset = entryPoint
or: [targetMethod asInteger + cmDynSuperEntryOffset = entryPoint]).
"Avoid the effort of implementing PICs for the relatively low dynamic frequency
dynamic super send and simply rebind the send site."
targetMethod asInteger + cmDynSuperEntryOffset = entryPoint ifTrue:
[^coInterpreter
ceDynamicSuperSend: targetMethod selector
to: receiver
numArgs: targetMethod cmNumArgs]].
self assert: targetMethod asInteger + cmEntryOffset = entryPoint.
self lookup: targetMethod selector
for: receiver
methodAndErrorSelectorInto:
[:method :errsel|
newTargetMethodOrNil := method.
errorSelectorOrNil := errsel].
"We assume lookupAndCog:for: will *not* reclaim the method zone"
self assert: outerReturn = coInterpreter stackTop.
cacheTag := objectRepresentation inlineCacheTagForInstance: receiver.
((errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand])
or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag)
or: [(backEnd inlineCacheTagAt: outerReturn) = self picAbortDiscriminatorValue
or: [newTargetMethodOrNil isNil
or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue:
[result := self patchToOpenPICFor: targetMethod selector
numArgs: targetMethod cmNumArgs
receiver: receiver.
self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory"
^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
"See if an Open PIC is already available."
pic := methodZone openPICWithSelector: targetMethod selector.
pic isNil ifTrue:
["otherwise attempt to create a closed PIC for the two cases."
pic := self cogPICSelector: targetMethod selector
numArgs: targetMethod cmNumArgs
Case0Method: targetMethod
Case1Method: newTargetMethodOrNil
tag: cacheTag
isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand.
(pic asInteger between: MaxNegativeErrorCode and: -1) ifTrue:
["For some reason the PIC couldn't be generated, most likely a lack of code memory.
Continue as if this is an unlinked send."
pic asInteger = InsufficientCodeSpace ifTrue:
[coInterpreter callForCogCompiledCodeCompaction].
^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
processor flushICacheFrom: pic asInteger to: pic asInteger + closedPICSize].
"Relink the send site to the pic. If to an open PIC then reset the cache tag to the selector,
for the benefit of the cacheTag assert check in checkIfValidObjectRef:pc:cogMethod:."
extent := pic cmType = CMOpenPIC
ifTrue:
[backEnd
rewriteInlineCacheAt: outerReturn
tag: targetMethod selector
target: pic asInteger + cmEntryOffset]
ifFalse:
[backEnd
rewriteCallAt: outerReturn
target: pic asInteger + cmEntryOffset].
processor flushICacheFrom: outerReturn - 1 - extent to: outerReturn - 1.
"Jump back into the pic at its entry in case this is an MNU (newTargetMethodOrNil is nil)"
coInterpreter
+ executeCogPIC: pic
- executeCogMethod: pic
fromLinkedSendWithReceiver: receiver
andCacheTag: (backEnd inlineCacheTagAt: outerReturn).
"NOTREACHED"
^nil!
Item was added:
+ ----- Method: Cogit>>fakeAddressFor:index: (in category 'initialization') -----
+ fakeAddressFor: anObject index: index
+ "Answer a fake address for some variable based on some index.
+ The index will usually be the size of simulatedAddresses, but
+ in determining the varBaseAddress we take a guess at the final
+ size of simulatedAddresses."
+ <doNotGenerate>
+ ^(index + 101 * objectMemory wordSize) negated
+ bitAnd: ((backEnd wantsNearAddressFor: anObject)
+ ifTrue: [self addressSpaceMask]
+ ifFalse: [self allButTopBitOfAddressSpaceMask])!
Item was changed:
----- Method: Cogit>>genEnilopmartFor:and:and:forCall:called: (in category 'initialization') -----
genEnilopmartFor: regArg1 and: regArg2 and: regArg3 forCall: forCall called: trampolineName
"An enilopmart (the reverse of a trampoline) is a piece of code that makes
the system-call-like transition from the C runtime into generated machine
code. The desired arguments and entry-point are pushed on a stackPage's
stack. The enilopmart pops off the values to be loaded into registers and
then executes a return instruction to pop off the entry-point and jump to it.
BEFORE AFTER (stacks grow down)
whatever stackPointer -> whatever
target address => reg1 = reg1val, etc
reg1val pc = target address
reg2val
stackPointer -> reg3val"
<returnTypeC: #'void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, sqInt trampolineName))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
+ backEnd maybeEstablishVarBase. "Must happen first; value may be used in genLoadStackPointers"
backEnd genLoadStackPointers.
regArg3 ifNotNil: [self PopR: regArg3].
regArg2 ifNotNil: [self PopR: regArg2].
self PopR: regArg1.
self genEnilopmartReturn: forCall.
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: trampolineName address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
Item was changed:
----- Method: Cogit>>initializeBackend (in category 'initialization') -----
initializeBackend
"A hook for the StackToregisterMappingCogit to override.
We just initialize the methodLabel here because backEnd is static."
methodLabel machineCodeSize: 0.
methodLabel opcode: Label.
methodLabel operands at: 0 put: 0.
methodLabel operands at: 1 put: 0. "label offset"
+ callerSavedRegMask := backEnd callerSavedRegisterMask.
+ backEnd hasVarBaseRegister ifTrue:
+ [self assert: ((self registerMaskFor: VarBaseReg) noMask: callerSavedRegMask)]!
- callerSavedRegMask := backEnd callerSavedRegisterMask!
Item was added:
+ ----- Method: Cogit>>registerMaskFor:and:and:and:and: (in category 'register management') -----
+ registerMaskFor: reg1 and: reg2 and: reg3 and: reg4 and: reg5
+ "Answer a bit mask identifying the symbolic registers.
+ Registers are negative numbers."
+ ^(((1 << (1 - reg1) bitOr: 1 << (1 - reg2)) bitOr: 1 << (1 - reg3)) bitOr: 1 << (1 - reg4)) bitOr: 1 << (1 - reg5)!
Item was added:
+ ----- Method: Cogit>>registerMaskFor:and:and:and:and:and: (in category 'register management') -----
+ registerMaskFor: reg1 and: reg2 and: reg3 and: reg4 and: reg5 and: reg6
+ "Answer a bit mask identifying the symbolic registers.
+ Registers are negative numbers."
+ ^((((1 << (1 - reg1) bitOr: 1 << (1 - reg2)) bitOr: 1 << (1 - reg3)) bitOr: 1 << (1 - reg4)) bitOr: 1 << (1 - reg5)) bitOr: 1 << (1 - reg6)!
Item was changed:
----- Method: Cogit>>simulatedAddressFor: (in category 'initialization') -----
simulatedAddressFor: anObject
"Answer a simulated address for a block or a symbol. This is an address that
can be called, read or written by generated machine code, and will be mapped
into a Smalltalk message send or block evaluation.
N.B. These addresses are at the top end of the bottom half of the address space
so that they don't have the sign bit set and so will not look like negative numbers,
unless they're the short-cut routines on ARM, where we want to use a bl, not a blx."
<doNotGenerate>
^simulatedAddresses
at: anObject
+ ifAbsentPut: [self fakeAddressFor: anObject index: simulatedAddresses size]!
- ifAbsentPut:
- [(simulatedAddresses size + 101 * objectMemory wordSize) negated
- bitAnd: ((backEnd wantsNearAddressFor: anObject)
- ifTrue: [self addressSpaceMask]
- ifFalse: [self allButTopBitOfAddressSpaceMask])]!
Item was added:
+ ----- Method: Cogit>>varBaseAddress (in category 'accessing') -----
+ varBaseAddress
+ "We expect simulatedAddresses to have around 40 entries. 48 is hopefully a good maximum."
+ <doNotGenerate>
+ ^self cCode: [coInterpreter varBaseAddress]
+ inSmalltalk: [self fakeAddressFor: nil index: 48]!
Item was changed:
----- Method: SpurMemoryManager>>lookupAddress: (in category 'simulation only') -----
lookupAddress: address
"If address appears to be that of a Symbol or a few well-known objects (such as classes) answer it, otherwise answer nil.
For code disassembly"
<doNotGenerate>
| fmt size string class classSize maybeThisClass classNameIndex thisClassIndex |
((self addressCouldBeObj: address)
and: [(self classIndexOf: address) > 0]) ifFalse:
[^address = scavengeThreshold ifTrue:
['scavengeThreshold']].
address - self baseHeaderSize = hiddenRootsObj ifTrue:
[^'(hiddenRootsObj+baseHeaderSize)'].
fmt := self formatOf: address.
size := self lengthOf: address baseHeader: (self baseHeader: address) format: fmt.
size = 0 ifTrue:
[^address caseOf: { [nilObj] -> ['nil']. [trueObj] -> ['true']. [falseObj] -> ['false'] } otherwise: []].
((fmt between: self firstByteFormat and: self firstCompiledMethodFormat - 1) "indexable byte fields"
and: [(size between: 1 and: 64)
and: [Scanner isLiteralSymbol: (string := (0 to: size - 1) collect: [:i| Character value: (self fetchByte: i ofObject: address)])]]) ifTrue:
[^'#', (ByteString withAll: string)].
class := self fetchClassOfNonImm: address.
(class isNil or: [class = nilObj]) ifTrue:
[^nil].
"address is either a class or a metaclass, or an instance of a class or invalid. determine which."
classNameIndex := coInterpreter classNameIndex.
thisClassIndex := coInterpreter thisClassIndex.
((classSize := self numSlotsOf: class) <= (classNameIndex max: thisClassIndex)
or: [classSize > 255]) ifTrue:
[^nil].
"Address could be a class or a metaclass"
+ (fmt = 1 and: [size > classNameIndex]) ifTrue:
- (fmt = 1 and: [size >= classNameIndex]) ifTrue:
["Is address a class? If so class's thisClass is address."
(self lookupAddress: (self fetchPointer: classNameIndex ofObject: address)) ifNotNil:
[:maybeClassName|
(self fetchPointer: thisClassIndex ofObject: class) = address ifTrue:
[^maybeClassName allButFirst]].
"Is address a Metaclass? If so class's name is Metaclass and address's thisClass holds the class name"
((self isBytes: (self fetchPointer: classNameIndex ofObject: class))
and: [(self lookupAddress: (self fetchPointer: classNameIndex ofObject: class)) = '#Metaclass'
and: [size >= thisClassIndex]]) ifTrue:
[maybeThisClass := self fetchPointer: thisClassIndex ofObject: address.
(self lookupAddress: (self fetchPointer: classNameIndex ofObject: maybeThisClass)) ifNotNil:
[:maybeThisClassName| ^maybeThisClassName allButFirst, ' class']]].
^(self lookupAddress: (self fetchPointer: classNameIndex ofObject: class)) ifNotNil:
[:maybeClassName| 'a(n) ', maybeClassName allButFirst]!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genCallPICEnilopmartNumArgs: (in category 'initialization') -----
genCallPICEnilopmartNumArgs: numArgs
"Generate special versions of the ceCallCogCodePopReceiverAndClassRegs
enilopmart that also pop register args from the stack to undo the pushing of
register args in the abort/miss trampolines."
<returnTypeC: 'void (*genCallPICEnilopmartNumArgs(sqInt numArgs))(void)'>
| size endAddress enilopmart |
opcodeIndex := 0.
+ backEnd maybeEstablishVarBase. "Must happen first; value may be used in genLoadStackPointers"
backEnd genLoadStackPointers.
self PopR: ClassReg. "cacheTag"
self PopR: TempReg. "entry-point"
self PopR: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [SendNumArgsReg]). "retpc"
numArgs > 0 ifTrue:
[numArgs > 1 ifTrue:
[self PopR: Arg1Reg.
self assert: self numRegArgs = 2].
self PopR: Arg0Reg].
self PopR: ReceiverResultReg.
backEnd hasLinkRegister ifFalse: [self PushR: SendNumArgsReg]. "retpc"
self JumpR: TempReg.
self computeMaximumSizes.
size := self generateInstructionsAt: methodZoneBase.
endAddress := self outputInstructionsAt: methodZoneBase.
self assert: methodZoneBase + size = endAddress.
enilopmart := methodZoneBase.
methodZoneBase := self alignUptoRoutineBoundary: endAddress.
backEnd nopsFrom: endAddress to: methodZoneBase - 1.
self recordGeneratedRunTime: (self trampolineName: 'ceCallPIC' numArgs: numArgs) address: enilopmart.
^self cCoerceSimple: enilopmart to: #'void (*)(void)'!
1
0