author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 19 Aug 2009 20:28:12 +0000 | |
changeset 22 | 6d3c5fd122e3 |
parent 18 | e6921b3a5d5b |
child 23 | 377bc46cad12 |
permissions | -rw-r--r-- |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1 |
"{ Package: 'stx:goodies/newcompiler' }" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
2 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
3 |
Object subclass:#IRBuilder |
9
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
4 |
instanceVariableNames:'ir jumpBackTargetStacks jumpAheadStacks currentSequence |
18
e6921b3a5d5b
Fixed multiple occurence of line: instruction
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
10
diff
changeset
|
5 |
sourceMapNodes sourceMapByteIndex lastLine' |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
6 |
classVariableNames:'' |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
7 |
poolDictionaries:'' |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
8 |
category:'NewCompiler-IR' |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
9 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
10 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
11 |
IRBuilder comment:'I provide a simple interface for constructing an IRMethod. For example, to create an ir method that compares first instVar to first arg and returns ''yes'' or ''no'' (same example as in BytecodeGenerator), do: IRBuilder new numRargs: 2; addTemps: #(self a z); "rcvr, arg, & extra temp (not used here)" pushTemp: #self; pushInstVar: 1; pushTemp: #a; send: #>; jumpAheadTo: #else if: false; pushLiteral: ''yes''; returnTop; jumpAheadTarget: #else; pushLiteral: ''no''; returnTop; ir Sending #compiledMethod to an ir method will generate its compiledMethod. Sending #methodNode to it will decompile to its parse tree. ' |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
12 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
13 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
14 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
15 |
!IRBuilder class methodsFor:'instance creation'! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
16 |
|
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
17 |
for: anIRFunction |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
18 |
^ self basicNew initializeFor: anIRFunction. |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
19 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
20 |
"Created: / 30-03-2009 / 18:28:01 / Jan Vrany <vranyj1@fel.cvut.cz>" |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
21 |
! |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
22 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
23 |
forClosure |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
24 |
^ self basicNew initializeFor: IRClosure new. |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
25 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
26 |
"Created: / 30-03-2009 / 18:28:22 / Jan Vrany <vranyj1@fel.cvut.cz>" |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
27 |
! |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
28 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
29 |
forMethod |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
30 |
^ self basicNew initializeFor: IRMethod new. |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
31 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
32 |
"Created: / 30-03-2009 / 18:28:10 / Jan Vrany <vranyj1@fel.cvut.cz>" |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
33 |
! |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
34 |
|
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
35 |
new |
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
36 |
^ self forMethod |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
37 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
38 |
"Created: / 11-06-2008 / 00:51:36 / Jan Vrany <vranyj1@fel.cvut.cz>" |
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
39 |
"Modified: / 30-03-2009 / 18:28:32 / Jan Vrany <vranyj1@fel.cvut.cz>" |
22
6d3c5fd122e3
New utility instance creation method in IRBuilder
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
18
diff
changeset
|
40 |
! |
6d3c5fd122e3
New utility instance creation method in IRBuilder
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
18
diff
changeset
|
41 |
|
6d3c5fd122e3
New utility instance creation method in IRBuilder
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
18
diff
changeset
|
42 |
numRargs: numRargs tempNames: tempNames |
6d3c5fd122e3
New utility instance creation method in IRBuilder
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
18
diff
changeset
|
43 |
|
6d3c5fd122e3
New utility instance creation method in IRBuilder
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
18
diff
changeset
|
44 |
^ self forMethod |
6d3c5fd122e3
New utility instance creation method in IRBuilder
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
18
diff
changeset
|
45 |
numRargs: numRargs; |
6d3c5fd122e3
New utility instance creation method in IRBuilder
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
18
diff
changeset
|
46 |
addTemps: tempNames; |
6d3c5fd122e3
New utility instance creation method in IRBuilder
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
18
diff
changeset
|
47 |
yourself |
6d3c5fd122e3
New utility instance creation method in IRBuilder
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
18
diff
changeset
|
48 |
|
6d3c5fd122e3
New utility instance creation method in IRBuilder
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
18
diff
changeset
|
49 |
"Created: / 17-08-2009 / 14:19:15 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
50 |
! ! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
51 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
52 |
!IRBuilder methodsFor:'accessing'! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
53 |
|
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
54 |
closureBuilder |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
55 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
56 |
^IRBuilder forClosure |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
57 |
environmentIr: ir; |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
58 |
yourself |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
59 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
60 |
"Created: / 30-03-2009 / 18:29:15 / Jan Vrany <vranyj1@fel.cvut.cz>" |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
61 |
! |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
62 |
|
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
63 |
currentSequence |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
64 |
^currentSequence |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
65 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
66 |
|
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
67 |
environmentIr: anIRFunction |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
68 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
69 |
ir environmentIr: anIRFunction |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
70 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
71 |
"Created: / 30-03-2009 / 18:30:22 / Jan Vrany <vranyj1@fel.cvut.cz>" |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
72 |
! |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
73 |
|
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
74 |
properties: aDict |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
75 |
ir properties: aDict |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
76 |
! ! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
77 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
78 |
!IRBuilder methodsFor:'decompiling'! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
79 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
80 |
addJumpBackTarget: label to: sequence |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
81 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
82 |
(jumpBackTargetStacks at: label ifAbsentPut: [OrderedCollection new]) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
83 |
addLast: sequence |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
84 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
85 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
86 |
addTemps: newKeys |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
87 |
|
9
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
88 |
ir addTemps: newKeys |
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
89 |
|
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
90 |
"Modified: / 30-03-2009 / 11:15:46 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
91 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
92 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
93 |
testJumpAheadTarget: label |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
94 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
95 |
jumpAheadStacks at: label ifPresent: [:stack | |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
96 |
[stack isEmpty] whileFalse: [self jumpAheadTarget: label] |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
97 |
] |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
98 |
! ! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
99 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
100 |
!IRBuilder methodsFor:'initialize'! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
101 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
102 |
addTemp: tempKey |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
103 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
104 |
self addTemps: {tempKey} |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
105 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
106 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
107 |
initialize |
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
108 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
109 |
^self initializeFor: IRMethod new. |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
110 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
111 |
"Modified: / 30-03-2009 / 18:27:31 / Jan Vrany <vranyj1@fel.cvut.cz>" |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
112 |
! |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
113 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
114 |
initializeFor: anIRFunction |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
115 |
ir := anIRFunction. |
3
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
116 |
jumpAheadStacks := IdentityDictionary new. |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
117 |
jumpBackTargetStacks := IdentityDictionary new. |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
118 |
sourceMapNodes := OrderedCollection new. "stack" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
119 |
|
3
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
120 |
"Leave an empty sequence up front (guaranteed not to be in loop)" |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
121 |
ir startSequence:((IRSequence new orderNumber:0) method:ir). |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
122 |
currentSequence := (IRSequence new orderNumber:1) method:ir. |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
123 |
ir startSequence add:(IRJump new destination: currentSequence) |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
124 |
|
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
125 |
"Created: / 30-03-2009 / 18:27:04 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
126 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
127 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
128 |
numRargs: n |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
129 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
130 |
ir numRargs: n. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
131 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
132 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
133 |
primitiveNode: primNode |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
134 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
135 |
ir primitiveNode: primNode |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
136 |
! ! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
137 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
138 |
!IRBuilder methodsFor:'instr - old blocks'! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
139 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
140 |
blockReturnTop |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
141 |
| retInst newSequence | |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
142 |
retInst _ IRInstruction blockReturnTop. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
143 |
self add:retInst. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
144 |
newSequence _ IRSequence new orderNumber:currentSequence orderNumber +1. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
145 |
newSequence method:ir. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
146 |
currentSequence last isJumpOrReturn |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
147 |
ifFalse:[self add:(IRJump new destination:newSequence)]. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
148 |
currentSequence _ newSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
149 |
retInst successor:currentSequence |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
150 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
151 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
152 |
jumpOverBlockTo: labelSymbol |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
153 |
"Conditional jump to the sequence that will be created when jumpAheadTarget: labelSymbol is sent to self. This and its corresponding target is only good for one use. Other jumpAheadTo:... with the same label will be put on a stack and superceed existing ones until its jumpAheadTarget: is called." |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
154 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
155 |
| instr | |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
156 |
"jumpAheadTarget: label will pop this and replace destination with its basic block" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
157 |
(jumpAheadStacks at: labelSymbol ifAbsentPut: [OrderedCollection new]) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
158 |
addLast: (instr _ self add: (IRJumpOverBlock new)). |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
159 |
self startNewSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
160 |
instr blockSequence: currentSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
161 |
! ! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
162 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
163 |
!IRBuilder methodsFor:'instructions'! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
164 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
165 |
jumpAheadTarget: labelSymbol |
3
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
166 |
"Pop latest jumpAheadTo: with this labelSymbol and have it point to this new instruction sequence" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
167 |
|
3
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
168 |
| jumpInstrs | |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
169 |
self startNewSequence. |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
170 |
jumpInstrs := (jumpAheadStacks at: labelSymbol ifAbsent: [ |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
171 |
self error: 'Missing jumpAheadTo: ', labelSymbol printString]). |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
172 |
jumpInstrs do:[:jumpInstr | jumpInstr destination: currentSequence]. |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
173 |
jumpInstrs removeLast. |
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
174 |
|
c9845c180bd4
Fixes IRBytecodeGenerator >> #pushLiteral and IRBuilder >> #jumpAheadTo:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
1
diff
changeset
|
175 |
"Modified: / 03-11-2008 / 12:00:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
176 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
177 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
178 |
jumpAheadTo: labelSymbol |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
179 |
"Jump to the sequence that will be created when jumpAheadTarget: labelSymbol is sent to self. This is and its corresponding target is only good for one use. Other jumpAheadTo: with the same label will be put on a stack and superceed existing ones until its jumpAheadTarget: is called." |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
180 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
181 |
"jumpAheadTarget: label will pop this and replace destination with its basic block" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
182 |
(jumpAheadStacks at: labelSymbol ifAbsentPut: [OrderedCollection new]) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
183 |
addLast: (self add: IRJump new). |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
184 |
self startNewSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
185 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
186 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
187 |
jumpAheadTo: labelSymbol if: boolean |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
188 |
"Conditional jump to the sequence that will be created when jumpAheadTarget: labelSymbol is sent to self. This and its corresponding target is only good for one use. Other jumpAheadTo:... with the same label will be put on a stack and superceed existing ones until its jumpAheadTarget: is called." |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
189 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
190 |
| instr | |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
191 |
"jumpAheadTarget: label will pop this and replace destination with its basic block" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
192 |
(jumpAheadStacks at: labelSymbol ifAbsentPut: [OrderedCollection new]) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
193 |
addLast: (instr _ self add: (IRJumpIf new boolean: boolean)). |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
194 |
self startNewSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
195 |
instr otherwise: currentSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
196 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
197 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
198 |
jumpBackTarget: labelSymbol |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
199 |
"Remember this basic block for a future jumpBackTo: labelSymbol. Stack up remembered targets with same name and remove them from stack for each jumpBackTo: called with same name." |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
200 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
201 |
self startNewSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
202 |
(jumpBackTargetStacks at: labelSymbol ifAbsentPut: [OrderedCollection new]) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
203 |
addLast: currentSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
204 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
205 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
206 |
jumpBackTo: labelSymbol |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
207 |
"Pop last remembered position with this label and write an unconditional jump to it" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
208 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
209 |
| sequence | |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
210 |
sequence _ (jumpBackTargetStacks at: labelSymbol ifAbsent: [self error: 'Missing jumpBackTarget: ', labelSymbol printString]) removeLast. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
211 |
self add: (IRJump new destination: sequence). |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
212 |
self startNewSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
213 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
214 |
|
9
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
215 |
line:line |
6
49a61123c743
A new IRLine pseudoinstruction added to include debugging info into the bytecode.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
5
diff
changeset
|
216 |
|
18
e6921b3a5d5b
Fixed multiple occurence of line: instruction
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
10
diff
changeset
|
217 |
lastLine ~= line ifTrue: |
e6921b3a5d5b
Fixed multiple occurence of line: instruction
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
10
diff
changeset
|
218 |
[self add:(IRInstruction line:line). |
e6921b3a5d5b
Fixed multiple occurence of line: instruction
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
10
diff
changeset
|
219 |
lastLine := line]. |
e6921b3a5d5b
Fixed multiple occurence of line: instruction
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
10
diff
changeset
|
220 |
|
e6921b3a5d5b
Fixed multiple occurence of line: instruction
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
10
diff
changeset
|
221 |
"Modified: / 12-05-2009 / 16:11:01 / Jan Vrany <vranyj1@fel.cvut.cz>" |
6
49a61123c743
A new IRLine pseudoinstruction added to include debugging info into the bytecode.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
5
diff
changeset
|
222 |
! |
49a61123c743
A new IRLine pseudoinstruction added to include debugging info into the bytecode.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
5
diff
changeset
|
223 |
|
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
224 |
popTop |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
225 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
226 |
self add: IRInstruction popTop |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
227 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
228 |
|
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
229 |
pushBlock: irClosure |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
230 |
|
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
231 |
self |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
232 |
assert: irClosure isIRClosure |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
233 |
message: 'Argument must be an instance of irClosure'. |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
234 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
235 |
self add: (IRInstruction pushBlock: irClosure) |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
236 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
237 |
"Modified: / 30-03-2009 / 16:49:07 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
238 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
239 |
|
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
240 |
pushBlockUsingBuilder: oneArgBlock |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
241 |
|
10
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
242 |
| closureBuilder | |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
243 |
closureBuilder := self closureBuilder. |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
244 |
oneArgBlock value: closureBuilder. |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
245 |
^self pushBlock: closureBuilder ir |
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
246 |
|
0fd549e0c784
First simple block works. See IRBuilderTest>>testBlock_blockTempArg.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
9
diff
changeset
|
247 |
"Created: / 30-03-2009 / 18:32:02 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
248 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
249 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
250 |
pushDup |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
251 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
252 |
self add: IRInstruction pushDup |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
253 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
254 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
255 |
pushGlobal: object |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
256 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
257 |
self pushLiteralVariable: object |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
258 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
259 |
"Created: / 11-06-2008 / 11:21:23 / Jan Vrany <vranyj1@fel.cvut.cz>" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
260 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
261 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
262 |
pushInstVar: instVarIndex |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
263 |
"Receiver must be on top" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
264 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
265 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
266 |
self add: (IRInstruction pushInstVar: instVarIndex). |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
267 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
268 |
" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
269 |
self pushLiteral: instVarIndex. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
270 |
self send: #privGetField:. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
271 |
" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
272 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
273 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
274 |
pushLiteral: object |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
275 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
276 |
self add: (IRInstruction pushLiteral: object) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
277 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
278 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
279 |
pushLiteralVariable: object |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
280 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
281 |
self add: (IRInstruction pushLiteralVariable: object) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
282 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
283 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
284 |
pushReceiver |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
285 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
286 |
self add: (IRInstruction pushReceiver) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
287 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
288 |
|
9
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
289 |
pushTemp:key |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
290 |
|
9
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
291 |
self add: (ir pushTemp: key in: ir level: 0) |
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
292 |
|
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
293 |
"Modified: / 30-03-2009 / 12:00:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
294 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
295 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
296 |
pushThisContext |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
297 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
298 |
self add: (IRInstruction pushThisContext) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
299 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
300 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
301 |
pushThisEnv |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
302 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
303 |
self add: (IRInstruction pushTemp: -1) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
304 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
305 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
306 |
remoteReturn |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
307 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
308 |
self add: IRInstruction remoteReturn. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
309 |
self startNewSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
310 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
311 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
312 |
returnTop |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
313 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
314 |
self add: IRInstruction returnTop. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
315 |
self startNewSequence. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
316 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
317 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
318 |
send: selector |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
319 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
320 |
self add: (IRInstruction send: selector) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
321 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
322 |
|
5
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
323 |
send: selector numArgs: numArgs |
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
324 |
|
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
325 |
self add: (IRInstruction send: selector numArgs: numArgs) |
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
326 |
|
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
327 |
"Created: / 01-12-2008 / 19:56:10 / Jan Vrany <vranyj1@fel.cvut.cz>" |
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
328 |
! |
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
329 |
|
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
330 |
send: selector numArgs: numArgs toSuperOf: behavior |
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
331 |
|
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
332 |
self add: (IRInstruction send: selector numArgs: numArgs toSuperOf: behavior) |
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
333 |
|
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
334 |
"Created: / 01-12-2008 / 19:56:20 / Jan Vrany <vranyj1@fel.cvut.cz>" |
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
335 |
! |
b94aea1d3710
Added method IRBuilder>>#send:numArgs and IRBuilder>>#send:numArgs:toSuperOf:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3
diff
changeset
|
336 |
|
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
337 |
send: selector toSuperOf: behavior |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
338 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
339 |
self add: (IRInstruction send: selector toSuperOf: behavior) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
340 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
341 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
342 |
storeInstVar: instVarIndex |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
343 |
"receiver must be on top with new field value underneath" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
344 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
345 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
346 |
self add: (IRInstruction storeInstVar: instVarIndex). |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
347 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
348 |
"self pushLiteral: instVarIndex. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
349 |
self send: #privStoreIn:field:." |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
350 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
351 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
352 |
storeIntoLiteralVariable: object |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
353 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
354 |
self add: (IRInstruction storeIntoLiteralVariable: object) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
355 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
356 |
|
9
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
357 |
storeTemp:key |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
358 |
|
9
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
359 |
self add: (ir storeTemp: key in: ir level: 0) |
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
360 |
|
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
361 |
"Modified: / 30-03-2009 / 12:00:28 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
362 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
363 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
364 |
storeThisEnv |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
365 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
366 |
self add: (IRInstruction storeTemp: -1) |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
367 |
! ! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
368 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
369 |
!IRBuilder methodsFor:'mapping'! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
370 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
371 |
mapToByteIndex: index |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
372 |
"decompiling" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
373 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
374 |
sourceMapByteIndex _ index |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
375 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
376 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
377 |
mapToNode: object |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
378 |
"new instructions will be associated with object" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
379 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
380 |
sourceMapNodes addLast: object |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
381 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
382 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
383 |
popMap |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
384 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
385 |
sourceMapNodes removeLast |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
386 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
387 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
388 |
sourceByteIndex |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
389 |
"decompiling" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
390 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
391 |
^ sourceMapByteIndex |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
392 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
393 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
394 |
sourceNode |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
395 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
396 |
^ sourceMapNodes isEmpty |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
397 |
ifTrue: [nil] |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
398 |
ifFalse: [sourceMapNodes last] |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
399 |
! ! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
400 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
401 |
!IRBuilder methodsFor:'private'! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
402 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
403 |
add: instr |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
404 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
405 |
"Associate instr with current parse node or byte range" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
406 |
instr sourceNode: self sourceNode. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
407 |
instr bytecodeIndex: self sourceByteIndex. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
408 |
^ currentSequence add: instr |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
409 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
410 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
411 |
addLiteral: aSymbol |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
412 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
413 |
ir addLiteral: aSymbol |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
414 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
415 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
416 |
addLiterals: aSymbol |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
417 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
418 |
ir addLiterals: aSymbol |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
419 |
! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
420 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
421 |
startNewSequence |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
422 |
"End current instruction sequence and start a new sequence to add instructions to. If ending block just falls through to new block then add an explicit jump to it so they stay linked" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
423 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
424 |
| newSequence | |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
425 |
currentSequence isEmpty ifTrue:[^ self]. "block is still empty, continue using it" |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
426 |
newSequence _ IRSequence new orderNumber:currentSequence orderNumber +1. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
427 |
newSequence method:ir. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
428 |
currentSequence last isJumpOrReturn |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
429 |
ifFalse:[self add:(IRJump new destination:newSequence)]. |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
430 |
currentSequence _ newSequence |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
431 |
! ! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
432 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
433 |
!IRBuilder methodsFor:'results'! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
434 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
435 |
ir |
9
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
436 |
^ ir |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
437 |
|
9
04518c7fb91c
Initial support for closures.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
6
diff
changeset
|
438 |
"Modified: / 28-03-2009 / 21:01:46 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
439 |
! ! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
440 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
441 |
!IRBuilder class methodsFor:'documentation'! |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
442 |
|
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
443 |
version |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
444 |
^'$Id$' |
0dd36941955f
Initial revision. All tests pass.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
445 |
! ! |