Sun, 21 Nov 2010 16:27:18 +0000
Implement OP_TFORLOOP
0 | 1 | |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
2 | var OP_MOVE = 0; |
0 | 3 | var OP_LOADK = 1; |
39 | 4 | var OP_LOADBOOL = 2; |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
5 | var OP_LOADNIL = 3; |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
6 | var OP_GETUPVAL = 4; |
0 | 7 | var OP_GETGLOBAL = 5; |
28
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
8 | var OP_GETTABLE = 6; |
6 | 9 | var OP_SETGLOBAL = 7; |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
10 | var OP_SETUPVAL = 8; |
28
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
11 | var OP_SETTABLE = 9; |
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
12 | var OP_NEWTABLE = 10; |
36 | 13 | var OP_SELF = 11; |
58
40d0b0429428
Implement OP_ADD, OP_SUB, OP_LT
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
14 | var OP_ADD = 12; |
40d0b0429428
Implement OP_ADD, OP_SUB, OP_LT
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
15 | var OP_SUB = 13; |
99
633e414a496c
Implement OP_DIV (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
98
diff
changeset
|
16 | var OP_DIV = 15; |
101
f1247747f025
Implement OP_CONCAT (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
100
diff
changeset
|
17 | var OP_CONCAT = 21; |
40
3a074ec1790f
Implement OP_TEST and OP_JMP
Matthew Wild <mwild1@gmail.com>
parents:
39
diff
changeset
|
18 | var OP_JMP = 22; |
81 | 19 | var OP_EQ = 23; |
58
40d0b0429428
Implement OP_ADD, OP_SUB, OP_LT
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
20 | var OP_LT = 24; |
90
40edbc05fbb9
Implement OP_LE (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
21 | var OP_LE = 25; |
40
3a074ec1790f
Implement OP_TEST and OP_JMP
Matthew Wild <mwild1@gmail.com>
parents:
39
diff
changeset
|
22 | var OP_TEST = 26; |
59 | 23 | var OP_TESTSET = 27; |
0 | 24 | var OP_CALL = 28; |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
25 | var OP_RETURN = 30; |
34
2c3d73c76d0f
OP_FORPREP, OP_FORLOOP: Support for numerical for loops
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
26 | var OP_FORLOOP = 31; |
2c3d73c76d0f
OP_FORPREP, OP_FORLOOP: Support for numerical for loops
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
27 | var OP_FORPREP = 32; |
102 | 28 | var OP_TFORLOOP = 33; |
15
5240eaff785f
Implement basic OP_CLOSURE (no support for upvalues yet)
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
29 | var OP_CLOSURE = 36; |
0 | 30 | |
91
298efa276aff
Disable debugMode, accidentally committed
Matthew Wild <mwild1@gmail.com>
parents:
90
diff
changeset
|
31 | var debugMode = false; |
8 | 32 | |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
33 | function LValue(vm, type, value) |
0 | 34 | { |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
35 | this.vm = vm; |
0 | 36 | this.type = type||"nil"; |
37
62c1d9bf3000
Allow LValues with a value of 'false' to be create (it was converted to 'null')
Matthew Wild <mwild1@gmail.com>
parents:
36
diff
changeset
|
37 | this.value = value; |
0 | 38 | } |
39 | ||
40 | LValue.prototype = { | |
41 | call: function (args) | |
42 | { | |
49
052bd6e8daf6
Give LValue precall() and call() methods, give functions a vm property.
Matthew Wild <mwild1@gmail.com>
parents:
48
diff
changeset
|
43 | var f = this.precall(); |
74
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
44 | var ret = this.vm.call(f, args); |
49
052bd6e8daf6
Give LValue precall() and call() methods, give functions a vm property.
Matthew Wild <mwild1@gmail.com>
parents:
48
diff
changeset
|
45 | if(typeof(ret) == "undefined") |
052bd6e8daf6
Give LValue precall() and call() methods, give functions a vm property.
Matthew Wild <mwild1@gmail.com>
parents:
48
diff
changeset
|
46 | ret = []; |
052bd6e8daf6
Give LValue precall() and call() methods, give functions a vm property.
Matthew Wild <mwild1@gmail.com>
parents:
48
diff
changeset
|
47 | return ret; |
052bd6e8daf6
Give LValue precall() and call() methods, give functions a vm property.
Matthew Wild <mwild1@gmail.com>
parents:
48
diff
changeset
|
48 | }, |
052bd6e8daf6
Give LValue precall() and call() methods, give functions a vm property.
Matthew Wild <mwild1@gmail.com>
parents:
48
diff
changeset
|
49 | precall: function () |
052bd6e8daf6
Give LValue precall() and call() methods, give functions a vm property.
Matthew Wild <mwild1@gmail.com>
parents:
48
diff
changeset
|
50 | { |
3
6f338fbf0abc
Throw an error if trying to call a non-function
Matthew Wild <mwild1@gmail.com>
parents:
2
diff
changeset
|
51 | if(this.type == "function") |
6f338fbf0abc
Throw an error if trying to call a non-function
Matthew Wild <mwild1@gmail.com>
parents:
2
diff
changeset
|
52 | return this.value; |
6f338fbf0abc
Throw an error if trying to call a non-function
Matthew Wild <mwild1@gmail.com>
parents:
2
diff
changeset
|
53 | else |
6f338fbf0abc
Throw an error if trying to call a non-function
Matthew Wild <mwild1@gmail.com>
parents:
2
diff
changeset
|
54 | throw "Attempt to call a " + this.type + " value"; |
0 | 55 | }, |
54
5e0bdf7f234f
Support for __index metamethod
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
56 | index: function (key, raw) |
0 | 57 | { |
58 | if(this.type == "table") | |
59 | { | |
54
5e0bdf7f234f
Support for __index metamethod
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
60 | var val; |
5e0bdf7f234f
Support for __index metamethod
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
61 | if(key.value in this.value) |
5e0bdf7f234f
Support for __index metamethod
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
62 | return this.value[key.value]; |
5e0bdf7f234f
Support for __index metamethod
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
63 | else if(raw != true && this.metatable && this.metatable.type != "nil") |
5e0bdf7f234f
Support for __index metamethod
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
64 | { |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
65 | var __index = this.metatable.index(this.vm.LValue("__index")); |
60
430a0b155703
Support for tables in __index
Matthew Wild <mwild1@gmail.com>
parents:
59
diff
changeset
|
66 | if(__index.type == "function") |
54
5e0bdf7f234f
Support for __index metamethod
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
67 | { |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
68 | return this.vm.LValue(__index.call([this, key])[0]); |
54
5e0bdf7f234f
Support for __index metamethod
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
69 | } |
60
430a0b155703
Support for tables in __index
Matthew Wild <mwild1@gmail.com>
parents:
59
diff
changeset
|
70 | else if(__index.type != "nil") |
430a0b155703
Support for tables in __index
Matthew Wild <mwild1@gmail.com>
parents:
59
diff
changeset
|
71 | return __index.index(key); |
54
5e0bdf7f234f
Support for __index metamethod
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
72 | } |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
73 | return this.vm.LValue(null); |
0 | 74 | } |
7
00ec5f6e7579
Add errors for when trying to index non-tables
Matthew Wild <mwild1@gmail.com>
parents:
6
diff
changeset
|
75 | else |
00ec5f6e7579
Add errors for when trying to index non-tables
Matthew Wild <mwild1@gmail.com>
parents:
6
diff
changeset
|
76 | throw "Attempt to index a " + this.type + " value"; |
0 | 77 | }, |
78 | setIndex: function (key, value) | |
79 | { | |
80 | if(this.type == "table") | |
81 | { | |
82 | this.value[key.value] = value; | |
83 | } | |
7
00ec5f6e7579
Add errors for when trying to index non-tables
Matthew Wild <mwild1@gmail.com>
parents:
6
diff
changeset
|
84 | else |
00ec5f6e7579
Add errors for when trying to index non-tables
Matthew Wild <mwild1@gmail.com>
parents:
6
diff
changeset
|
85 | throw "Attempt to index a " + this.type + " value"; |
53 | 86 | }, |
87 | setMetatable: function (metatable) | |
88 | { | |
89 | if(metatable.type == "table") | |
90 | this.metatable = metatable; | |
91 | else if(metatable.type == "nil") | |
92 | this.metatable = null; | |
93 | else | |
94 | throw "Attempt to set a "+metatable.type+" value as a metatable"; | |
61 | 95 | }, |
96 | toString: function () | |
97 | { | |
98 | switch(this.type) | |
99 | { | |
100 | case "nil": | |
101 | return "nil"; | |
102 | default: | |
103 | return this.value.toString(); | |
104 | } | |
72
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
105 | }, |
86
97678a1565d4
Add LValue.truth() to return whether a value is (not(false) and not(nil))
Matthew Wild <mwild1@gmail.com>
parents:
85
diff
changeset
|
106 | truth: function () |
97678a1565d4
Add LValue.truth() to return whether a value is (not(false) and not(nil))
Matthew Wild <mwild1@gmail.com>
parents:
85
diff
changeset
|
107 | { |
97678a1565d4
Add LValue.truth() to return whether a value is (not(false) and not(nil))
Matthew Wild <mwild1@gmail.com>
parents:
85
diff
changeset
|
108 | if(this.type == "nil" || (this.type == "boolean" && this.value == false)) |
97678a1565d4
Add LValue.truth() to return whether a value is (not(false) and not(nil))
Matthew Wild <mwild1@gmail.com>
parents:
85
diff
changeset
|
109 | return false; |
97678a1565d4
Add LValue.truth() to return whether a value is (not(false) and not(nil))
Matthew Wild <mwild1@gmail.com>
parents:
85
diff
changeset
|
110 | return true; |
97678a1565d4
Add LValue.truth() to return whether a value is (not(false) and not(nil))
Matthew Wild <mwild1@gmail.com>
parents:
85
diff
changeset
|
111 | }, |
72
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
112 | add: function (op2) |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
113 | { |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
114 | var metamethod; |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
115 | var __add = this.vm.LValue("__add"); |
72
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
116 | if(this.metatable) |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
117 | metamethod = this.metatable.index(__add); |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
118 | if((!metamethod || metamethod.type == "nil") && op2.metatable) |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
119 | metamethod = op2.metatable.index(__add); |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
120 | if(metamethod && metamethod.type != "nil") |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
121 | { |
75
aaecd573ee30
Support for __add metamethod
Matthew Wild <mwild1@gmail.com>
parents:
74
diff
changeset
|
122 | return metamethod.call([this, op2]); |
72
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
123 | } |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
124 | else if((this.type == "number" || this.type == "string") |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
125 | && (op2.type == "number" || op2.type == "string")) |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
126 | { |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
127 | // Plain addition |
76
d7d7a6bb90cd
Fix OP_ADD code to use new LValue format
Matthew Wild <mwild1@gmail.com>
parents:
75
diff
changeset
|
128 | return this.vm.LValue(parseFloat(this.value, 10) + parseFloat(op2.value, 10)); |
72
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
129 | } |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
130 | else |
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
131 | throw "Attempt to perform arithmetic on a "+this.type+" and "+op2.type; |
80
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
132 | }, |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
133 | equals: function (op2) |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
134 | { |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
135 | if(this.type != op2.type) |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
136 | return false; |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
137 | if(this.value == op2.value) |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
138 | return true; |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
139 | var __eq = this.vm.LValue("__eq"); |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
140 | if(this.metatable && op2.metatable) |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
141 | { |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
142 | var metamethod1 = this.metatable.index(__eq); |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
143 | var metamethod2 = op2.metatable.index(__eq); |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
144 | if(metamethod1.equals(metamethod2)) |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
145 | { |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
146 | var result = metamethod1.call([this, op2]); |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
147 | return (result[0].type != "nil" |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
148 | && (result[0].type != "boolean" || result[0].value == true) |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
149 | ); |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
150 | } |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
151 | } |
beb0bb936aca
Give LValue an equals() method, returns true/false if the value == the first argument (checks metamethod)
Matthew Wild <mwild1@gmail.com>
parents:
79
diff
changeset
|
152 | return false; |
0 | 153 | } |
154 | }; | |
155 | ||
92
e9da9847121a
Pass sourceName to child chunks (in binary files it's only set in the top-level chunk)
Matthew Wild <mwild1@gmail.com>
parents:
91
diff
changeset
|
156 | function LBinaryChunk(vm, chunk, start, sourceName) |
0 | 157 | { |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
158 | this.chunk = chunk; |
13
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
159 | this.pos = start||12; |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
160 | |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
161 | this.sourceName = this.readString(); |
92
e9da9847121a
Pass sourceName to child chunks (in binary files it's only set in the top-level chunk)
Matthew Wild <mwild1@gmail.com>
parents:
91
diff
changeset
|
162 | if(sourceName) |
e9da9847121a
Pass sourceName to child chunks (in binary files it's only set in the top-level chunk)
Matthew Wild <mwild1@gmail.com>
parents:
91
diff
changeset
|
163 | this.sourceName = sourceName; |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
164 | this.lineDefined = this.readInt(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
165 | this.lastLineDefined = this.readInt(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
166 | this.numUpvalues = this.readByte(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
167 | this.numParameters = this.readByte(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
168 | this.isVararg = this.readByte(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
169 | this.maxStackSize = this.readByte(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
170 | |
0 | 171 | this.instructions = []; |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
172 | |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
173 | this.numInstructions = this.readInt(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
174 | for(var i=0;i<this.numInstructions;i++) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
175 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
176 | var ins = this.readInt(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
177 | this.instructions.push([ |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
178 | ins&0x3F, // Opcode |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
179 | (ins>>6)&0xFF, // Field A |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
180 | (ins>>23)&0x1FF, // Field B |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
181 | (ins>>14)&0x1FF // Field C |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
182 | ]); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
183 | if(debugMode) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
184 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
185 | var pi = this.instructions[this.instructions.length-1]; |
31
bc58527bac34
Print sBx field in bytecode dump (for debugging)
Matthew Wild <mwild1@gmail.com>
parents:
30
diff
changeset
|
186 | sys.puts("Pos: "+(this.pos-4)+" Ins: "+ins+" OP: "+INS_OPCODE(pi)+" A: "+INS_A(pi)+" B: "+INS_B(pi)+" C: "+INS_C(pi)+" Bx: "+INS_Bx(pi)+" sBx: "+(INS_Bx(pi)-0x1FFFE)); |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
187 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
188 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
189 | |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
190 | this.constants = []; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
191 | |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
192 | this.numConstants = this.readInt(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
193 | for(var i=0;i<this.numConstants;i++) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
194 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
195 | var type = this.readByte(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
196 | switch(type) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
197 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
198 | case 0: // Nil |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
199 | this.constants.push(new LValue(vm, "nil", null)); |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
200 | break; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
201 | case 1: // Boolean |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
202 | this.constants.push(new LValue(vm, "boolean", this.readByte())); // FIXME type |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
203 | break; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
204 | case 3: // Number |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
205 | this.constants.push(new LValue(vm, "number", this.readNumber())); |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
206 | break; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
207 | case 4: // String |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
208 | this.constants.push(new LValue(vm, "string", this.readString())); |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
209 | break; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
210 | default: |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
211 | throw "Invalid constant type "+type+" in bytecode"; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
212 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
213 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
214 | |
13
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
215 | this.prototypes = []; |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
216 | |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
217 | this.numPrototypes = this.readInt(); |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
218 | for(var i=0;i<this.numPrototypes;i++) |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
219 | { |
92
e9da9847121a
Pass sourceName to child chunks (in binary files it's only set in the top-level chunk)
Matthew Wild <mwild1@gmail.com>
parents:
91
diff
changeset
|
220 | var p = new LBinaryChunk(vm, chunk, this.pos, this.sourceName); |
13
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
221 | this.pos = p.pos; |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
222 | this.prototypes.push(p); |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
223 | } |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
224 | |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
225 | this.sourceLines = []; |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
226 | |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
227 | this.numSourceLines = this.readInt(); |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
228 | for(var i=0;i<this.numSourceLines;i++) |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
229 | { |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
230 | this.sourceLines.push(this.readInt()); |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
231 | } |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
232 | |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
233 | this.localList = []; |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
234 | this.numLocalList = this.readInt(); |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
235 | for(var i=0;i<this.numLocalList;i++) |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
236 | { |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
237 | this.localList.push([this.readString(),this.readInt(),this.readInt()]); |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
238 | } |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
239 | |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
240 | this.upvalueList = []; |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
241 | this.numUpvalueList = this.readInt(); |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
242 | for(var i=0;i<this.numUpvalueList;i++) |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
243 | { |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
244 | this.upvalueList.push(this.readString()); |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
245 | } |
f259da6951e8
Support for reading all fields in the chunk (including function prototypes, required for OP_CLOSURE)
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
246 | |
0 | 247 | return this; |
248 | } | |
249 | ||
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
250 | LBinaryChunk.prototype = { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
251 | readBytes: function (n) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
252 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
253 | return this.chunk.slice(this.pos, this.pos+=n); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
254 | }, |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
255 | readByte: function () |
0 | 256 | { |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
257 | return this.readBytes(1).charCodeAt(0); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
258 | }, |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
259 | readInt: function () |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
260 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
261 | //FIXME: Endianness |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
262 | return this.readByte() | (this.readByte()<<8) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
263 | | (this.readByte()<<16) | (this.readByte()<<24); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
264 | }, |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
265 | readString: function () |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
266 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
267 | var len = this.readInt(); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
268 | return this.readBytes(len).substring(0,len-1); |
0 | 269 | }, |
12
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
270 | readNumber: function () |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
271 | { |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
272 | //FIXME: Endianness |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
273 | var bytes = [this.readByte(),this.readByte(),this.readByte(),this.readByte(), |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
274 | this.readByte(),this.readByte(),this.readByte(),this.readByte()].reverse(); |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
275 | |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
276 | var sign = (bytes[0]>>7)&0x1; |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
277 | var exp = (bytes[0]&0x7F)<<4 | (bytes[1]&0xf0)>>4; |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
278 | |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
279 | var frac = ((bytes[1] & 0x0f) * Math.pow(2,48)) |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
280 | + (bytes[2] * Math.pow(2,40)) |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
281 | + (bytes[3] * Math.pow(2,32)) |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
282 | + (bytes[4] * Math.pow(2,24)) |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
283 | + (bytes[5] * Math.pow(2,16)) |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
284 | + (bytes[6] * Math.pow(2,8)) |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
285 | + bytes[7]; |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
286 | |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
287 | if(exp != 0x000 && exp != 0x7FF) |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
288 | { |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
289 | var n = (sign==1?-1:1)*Math.pow(2,exp-1023)*(1+(frac/0x10000000000000)); |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
290 | return n; |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
291 | } |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
292 | else if(exp == 0x000) |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
293 | { |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
294 | return sign*0; |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
295 | } |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
296 | else |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
297 | return frac==0?sign*Infinity:NaN; |
7d748aba47ab
Initial stab at reading Number constants from bytecode
Matthew Wild <mwild1@gmail.com>
parents:
11
diff
changeset
|
298 | } |
0 | 299 | }; |
300 | ||
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
301 | function INS_OPCODE(ins) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
302 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
303 | return ins[0]; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
304 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
305 | |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
306 | function INS_A(ins) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
307 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
308 | return ins[1]; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
309 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
310 | |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
311 | function INS_B(ins) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
312 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
313 | return ins[2]; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
314 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
315 | |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
316 | function INS_C(ins) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
317 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
318 | return ins[3]; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
319 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
320 | |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
321 | function INS_Bx(ins) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
322 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
323 | return ((INS_C(ins))|(INS_B(ins)<<9)); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
324 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
325 | |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
326 | function INS_sBx(ins) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
327 | { |
32
035aacc192d8
Fix off-by-one in calculating the value of sBx
Matthew Wild <mwild1@gmail.com>
parents:
31
diff
changeset
|
328 | return (INS_Bx(ins)-0x1FFFF); |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
329 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
330 | |
77
ab8ff064d808
Add new RK() helper and fix OP_ADD to use it (so it loads constants properly)
Matthew Wild <mwild1@gmail.com>
parents:
76
diff
changeset
|
331 | function RK(frame, R) |
ab8ff064d808
Add new RK() helper and fix OP_ADD to use it (so it loads constants properly)
Matthew Wild <mwild1@gmail.com>
parents:
76
diff
changeset
|
332 | { |
ab8ff064d808
Add new RK() helper and fix OP_ADD to use it (so it loads constants properly)
Matthew Wild <mwild1@gmail.com>
parents:
76
diff
changeset
|
333 | var keysource = (R&0x100)?frame.f.constants:frame.reg; |
ab8ff064d808
Add new RK() helper and fix OP_ADD to use it (so it loads constants properly)
Matthew Wild <mwild1@gmail.com>
parents:
76
diff
changeset
|
334 | return keysource[R&0xff]; |
ab8ff064d808
Add new RK() helper and fix OP_ADD to use it (so it loads constants properly)
Matthew Wild <mwild1@gmail.com>
parents:
76
diff
changeset
|
335 | } |
ab8ff064d808
Add new RK() helper and fix OP_ADD to use it (so it loads constants properly)
Matthew Wild <mwild1@gmail.com>
parents:
76
diff
changeset
|
336 | |
43
ecfa7896af35
Give LFunctions a vm property
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
337 | function LFunction(vm, chunk, env) |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
338 | { |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
339 | function F() {}; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
340 | F.prototype = chunk; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
341 | var o = new F(); |
43
ecfa7896af35
Give LFunctions a vm property
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
342 | o.vm = vm; |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
343 | o.environment = env; |
14
21a2fce50931
Add chunk property to LFunction to show which chunk it came from
Matthew Wild <mwild1@gmail.com>
parents:
13
diff
changeset
|
344 | o.chunk = chunk; |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
345 | o.upvalues = []; |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
346 | return o; |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
347 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
348 | |
0 | 349 | function LVM() |
350 | { | |
351 | this.callstack = []; | |
352 | this.stack = []; | |
353 | return this; | |
354 | } | |
355 | ||
356 | LVM.prototype = { | |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
357 | LValue: function (value) |
0 | 358 | { |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
359 | switch(typeof(value)) |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
360 | { |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
361 | case "number": |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
362 | return new LValue(this, "number", value); |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
363 | case "string": |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
364 | return new LValue(this, "string", value); |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
365 | case "function": |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
366 | return new LValue(this, "function", value); |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
367 | case "object": |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
368 | if(value == null) |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
369 | return new LValue(this, "nil", value); |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
370 | else |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
371 | return new LValue(this, "table", value); |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
372 | case "undefined": |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
373 | return new LValue(this, "nil", null); |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
374 | default: |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
375 | throw "Not able to convert type " + |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
376 | typeof(value)+" from Javascript to Lua"; |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
377 | } |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
378 | }, |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
379 | call: function (lfFunction, args) |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
380 | { |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
381 | if(typeof(lfFunction) == "function") |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
382 | { |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
383 | return lfFunction.apply(this, args); |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
384 | } |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
385 | else |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
386 | { |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
387 | var frame = {f:lfFunction,pc:0,entry:true}; |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
388 | if(args) |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
389 | frame.reg = args.slice(0); |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
390 | else |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
391 | frame.reg = []; |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
392 | this.callstack.push(frame); |
82
72fe2316bd67
Fix for passing arguments to the entry call frame
Matthew Wild <mwild1@gmail.com>
parents:
81
diff
changeset
|
393 | for(var i=frame.reg.length;i<lfFunction.maxStackSize;i++) |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
394 | frame.reg[i] = this.LValue(null); |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
395 | return this.run(frame); |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
396 | } |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
397 | }, |
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
398 | run: function(frame) |
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
399 | { |
0 | 400 | var instruction; |
401 | while(this.callstack.length>0) | |
402 | { | |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
403 | instruction = frame.f.instructions[frame.pc++]; |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
404 | if(debugMode) |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
405 | { |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
406 | sys.puts("PC: "+(frame.pc-1)+" OP: "+instruction[0]); |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
407 | sys.puts("STACK: "+sys.inspect(frame.reg)); |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
408 | } |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
409 | switch(INS_OPCODE(instruction)) |
0 | 410 | { |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
411 | case OP_MOVE: |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
412 | frame.reg[INS_A(instruction)] = frame.reg[INS_B(instruction)]; |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
413 | break; |
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
414 | case OP_LOADNIL: |
10
ce2f27fa25a4
Use new notation for accessing instruction fields
Matthew Wild <mwild1@gmail.com>
parents:
9
diff
changeset
|
415 | for(var i = INS_A(instruction);i<=INS_B(instruction);i++) |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
416 | frame.reg[i] = new LValue(this, "nil", null); |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
417 | break; |
39 | 418 | case OP_LOADBOOL: |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
419 | frame.reg[INS_A(instruction)] = new LValue(this, "boolean", INS_B(instruction)!=0); |
39 | 420 | if(INS_C(instruction)!=0) |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
421 | frame.pc++; |
39 | 422 | break; |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
423 | case OP_GETUPVAL: |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
424 | frame.reg[INS_A(instruction)] = frame.f.upvalues[INS_B(instruction)]; |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
425 | break; |
0 | 426 | case OP_GETGLOBAL: |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
427 | var name = frame.f.constants[INS_Bx(instruction)]; |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
428 | frame.reg[INS_A(instruction)] = frame.f.environment.index(name); |
0 | 429 | break; |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
430 | case OP_SETUPVAL: |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
431 | var reg = frame.reg[INS_A(instruction)]; |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
432 | var upvalue = frame.f.upvalues[INS_B(instruction)]; |
26 | 433 | upvalue.type = reg.type; |
434 | upvalue.value = reg.value; | |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
435 | break; |
6 | 436 | case OP_SETGLOBAL: |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
437 | var name = frame.f.constants[INS_Bx(instruction)]; |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
438 | frame.f.environment.setIndex(name, frame.reg[instruction[1]]); |
6 | 439 | break; |
0 | 440 | case OP_LOADK: |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
441 | var constant = frame.f.constants[INS_Bx(instruction)]; |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
442 | frame.reg[INS_A(instruction)] = new LValue(this, constant.type, constant.value); |
0 | 443 | break; |
28
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
444 | case OP_NEWTABLE: |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
445 | frame.reg[INS_A(instruction)] = new LValue(this, "table", {}); |
28
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
446 | break; |
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
447 | case OP_GETTABLE: |
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
448 | var C = INS_C(instruction); |
78
a856f1c3364f
Update all opcodes to use RK() that need it
Matthew Wild <mwild1@gmail.com>
parents:
77
diff
changeset
|
449 | var value = frame.reg[INS_B(instruction)].index(RK(frame, C)).value; |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
450 | frame.reg[INS_A(instruction)] = this.LValue(value); |
28
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
451 | break; |
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
452 | case OP_SETTABLE: |
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
453 | var C = INS_C(instruction); |
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
454 | var B = INS_B(instruction); |
85
25470393fe74
Fix OP_SETTABLE to use RK() helper
Matthew Wild <mwild1@gmail.com>
parents:
83
diff
changeset
|
455 | frame.reg[INS_A(instruction)].setIndex(RK(frame, B), RK(frame, C)); |
28
d14b47c3870f
Support for OP_NEWTABLE, OP_GETTABLE, OP_SETTABLE
Matthew Wild <mwild1@gmail.com>
parents:
27
diff
changeset
|
456 | break; |
0 | 457 | case OP_CALL: |
49
052bd6e8daf6
Give LValue precall() and call() methods, give functions a vm property.
Matthew Wild <mwild1@gmail.com>
parents:
48
diff
changeset
|
458 | var f = frame.reg[INS_A(instruction)].precall(); // return JS or LValue |
63
be8bcd01409b
New interface for native Javascript functions called from Lua
Matthew Wild <mwild1@gmail.com>
parents:
62
diff
changeset
|
459 | var A = INS_A(instruction), B = INS_B(instruction), C = INS_C(instruction); |
be8bcd01409b
New interface for native Javascript functions called from Lua
Matthew Wild <mwild1@gmail.com>
parents:
62
diff
changeset
|
460 | var undefined; |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
461 | var args = frame.reg.slice(A+1, B==0?undefined:(A+B)); |
38
ba347b4b655f
Initialise all stack slots to nil when calling a chunk
Matthew Wild <mwild1@gmail.com>
parents:
37
diff
changeset
|
462 | for(var i=args.length+1;i<f.maxStackSize;i++) |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
463 | args[i] = new LValue(this, "nil", null); |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
464 | if(typeof(f) == "function") |
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
465 | { |
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
466 | // JS native function |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
467 | var ret = this.call(f, args); |
79
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
468 | // Insert ret to reg starting at R(A), with C-1 limit |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
469 | var nresults = ret.length; |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
470 | var nexpected; |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
471 | if(C == 0) |
63
be8bcd01409b
New interface for native Javascript functions called from Lua
Matthew Wild <mwild1@gmail.com>
parents:
62
diff
changeset
|
472 | { |
79
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
473 | nexpected = nresults; |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
474 | frame.reg = frame.reg.slice(0, A+nexpected); |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
475 | } |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
476 | else |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
477 | nexpected = C-1; |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
478 | for(var i = 0;;i++) |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
479 | { |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
480 | if(i < nresults) |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
481 | frame.reg[A+i] = ret[i]; |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
482 | else if(i < nexpected) |
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
483 | frame.reg[A+i] = new LValue(this, "nil", null); |
63
be8bcd01409b
New interface for native Javascript functions called from Lua
Matthew Wild <mwild1@gmail.com>
parents:
62
diff
changeset
|
484 | else |
79
94c0441b7321
Fix native function return values for the new calling interface
Matthew Wild <mwild1@gmail.com>
parents:
78
diff
changeset
|
485 | break; |
63
be8bcd01409b
New interface for native Javascript functions called from Lua
Matthew Wild <mwild1@gmail.com>
parents:
62
diff
changeset
|
486 | } |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
487 | } |
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
488 | else |
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
489 | { |
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
490 | // Lua function |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
491 | frame = {f:f,pc:0,reg:args, |
51
b429e7a73de7
More reliable detection of when we're at a native/Lua call boundary
Matthew Wild <mwild1@gmail.com>
parents:
50
diff
changeset
|
492 | retAt:INS_A(instruction),retCount:INS_C(instruction), |
b429e7a73de7
More reliable detection of when we're at a native/Lua call boundary
Matthew Wild <mwild1@gmail.com>
parents:
50
diff
changeset
|
493 | entry:false}; |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
494 | this.callstack.push(frame); |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
495 | } |
0 | 496 | break; |
15
5240eaff785f
Implement basic OP_CLOSURE (no support for upvalues yet)
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
497 | case OP_CLOSURE: |
5240eaff785f
Implement basic OP_CLOSURE (no support for upvalues yet)
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
498 | var prototype_id = INS_Bx(instruction); |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
499 | var chunk = frame.f.chunk.prototypes[prototype_id]; |
43
ecfa7896af35
Give LFunctions a vm property
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
500 | var f = new LFunction(this, chunk, frame.f.environment); |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
501 | frame.reg[INS_A(instruction)] = new LValue(this, "function", f); |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
502 | for(var i=0;i<chunk.numUpvalues;i++) |
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
503 | { |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
504 | var upval_instruction = frame.f.instructions[frame.pc++]; |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
505 | switch(INS_OPCODE(upval_instruction)) |
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
506 | { |
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
507 | case OP_MOVE: |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
508 | f.upvalues[i] = frame.reg[INS_B(upval_instruction)]; |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
509 | break; |
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
510 | case OP_GETUPVAL: |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
511 | f.upvalues[i] = frame.f.upvalues[INS_B(upval_instruction)]; |
20
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
512 | break; |
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
513 | default: |
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
514 | throw "Invalid upvalue opcode following OP_CLOSURE"; |
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
515 | } |
977ae93f612c
Support for upvalues in functions \o/ implemented OP_GETUPVAL, and a stub for OP_SETUPVAL.
Matthew Wild <mwild1@gmail.com>
parents:
19
diff
changeset
|
516 | } |
15
5240eaff785f
Implement basic OP_CLOSURE (no support for upvalues yet)
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
517 | break; |
0 | 518 | case OP_RETURN: |
19
8c9c1752272b
OP_RETURN: Support for return values from Lua functions \o/
Matthew Wild <mwild1@gmail.com>
parents:
18
diff
changeset
|
519 | var oldFrame = this.callstack.pop(); |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
520 | frame = this.callstack[this.callstack.length-1]; |
47
b8c4273edbbb
Support for return values from LVM.call()
Matthew Wild <mwild1@gmail.com>
parents:
46
diff
changeset
|
521 | var rets; |
b8c4273edbbb
Support for return values from LVM.call()
Matthew Wild <mwild1@gmail.com>
parents:
46
diff
changeset
|
522 | if(INS_B(instruction) == 0) |
b8c4273edbbb
Support for return values from LVM.call()
Matthew Wild <mwild1@gmail.com>
parents:
46
diff
changeset
|
523 | rets = oldFrame.reg.slice(INS_A(instruction)); |
b8c4273edbbb
Support for return values from LVM.call()
Matthew Wild <mwild1@gmail.com>
parents:
46
diff
changeset
|
524 | else |
b8c4273edbbb
Support for return values from LVM.call()
Matthew Wild <mwild1@gmail.com>
parents:
46
diff
changeset
|
525 | rets = oldFrame.reg.slice(INS_A(instruction),INS_A(instruction)+(INS_B(instruction)-1)); |
51
b429e7a73de7
More reliable detection of when we're at a native/Lua call boundary
Matthew Wild <mwild1@gmail.com>
parents:
50
diff
changeset
|
526 | if(!oldFrame.entry) |
19
8c9c1752272b
OP_RETURN: Support for return values from Lua functions \o/
Matthew Wild <mwild1@gmail.com>
parents:
18
diff
changeset
|
527 | { |
8c9c1752272b
OP_RETURN: Support for return values from Lua functions \o/
Matthew Wild <mwild1@gmail.com>
parents:
18
diff
changeset
|
528 | var i; |
64
77552f3c2c39
Correct off-by-one in return value limits
Matthew Wild <mwild1@gmail.com>
parents:
63
diff
changeset
|
529 | for(i=0;(oldFrame.retCount == 0||i<(oldFrame.retCount-1))&&i<rets.length;i++) |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
530 | frame.reg[oldFrame.retAt+i] = rets[i]; |
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
531 | if(oldFrame.retAt+i<frame.reg.length) |
65
134ddfbb2005
splice != slice. Dear Javascript, this is only one reason for why I don't like you.
Matthew Wild <mwild1@gmail.com>
parents:
64
diff
changeset
|
532 | frame.reg.slice(0,oldFrame.retAt+i); |
19
8c9c1752272b
OP_RETURN: Support for return values from Lua functions \o/
Matthew Wild <mwild1@gmail.com>
parents:
18
diff
changeset
|
533 | } |
47
b8c4273edbbb
Support for return values from LVM.call()
Matthew Wild <mwild1@gmail.com>
parents:
46
diff
changeset
|
534 | else |
b8c4273edbbb
Support for return values from LVM.call()
Matthew Wild <mwild1@gmail.com>
parents:
46
diff
changeset
|
535 | return rets; |
0 | 536 | break; |
36 | 537 | case OP_SELF: |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
538 | var table = frame.reg[INS_B(instruction)]; |
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
539 | frame.reg[INS_A(instruction)+1] = table; |
36 | 540 | var C = INS_C(instruction); |
78
a856f1c3364f
Update all opcodes to use RK() that need it
Matthew Wild <mwild1@gmail.com>
parents:
77
diff
changeset
|
541 | frame.reg[INS_A(instruction)] = table.index(RK(frame, C)); |
36 | 542 | break; |
34
2c3d73c76d0f
OP_FORPREP, OP_FORLOOP: Support for numerical for loops
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
543 | case OP_FORPREP: |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
544 | frame.pc+=(INS_sBx(instruction)); |
34
2c3d73c76d0f
OP_FORPREP, OP_FORLOOP: Support for numerical for loops
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
545 | var A = INS_A(instruction); |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
546 | frame.reg[A].value -= frame.reg[A+2].value; |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
547 | frame.reg[A+3] = new LValue(this, "number", null); |
34
2c3d73c76d0f
OP_FORPREP, OP_FORLOOP: Support for numerical for loops
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
548 | break; |
2c3d73c76d0f
OP_FORPREP, OP_FORLOOP: Support for numerical for loops
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
549 | case OP_FORLOOP: |
2c3d73c76d0f
OP_FORPREP, OP_FORLOOP: Support for numerical for loops
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
550 | var A = INS_A(instruction); |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
551 | var RA = frame.reg[A]; |
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
552 | RA.value += frame.reg[A+2].value; |
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
553 | if(RA.value <= frame.reg[A+1].value) |
34
2c3d73c76d0f
OP_FORPREP, OP_FORLOOP: Support for numerical for loops
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
554 | { |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
555 | frame.pc += INS_sBx(instruction); |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
556 | frame.reg[A+3].value = RA.value; |
34
2c3d73c76d0f
OP_FORPREP, OP_FORLOOP: Support for numerical for loops
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
557 | } |
2c3d73c76d0f
OP_FORPREP, OP_FORLOOP: Support for numerical for loops
Matthew Wild <mwild1@gmail.com>
parents:
33
diff
changeset
|
558 | break; |
102 | 559 | case OP_TFORLOOP: |
560 | var A = INS_A(instruction); | |
561 | var C = INS_C(instruction); | |
562 | var f = frame.reg[A].precall(); // Iterator function | |
563 | var rets = this.call(f, [frame.reg[A+1], frame.reg[A+2]]); | |
564 | frame.reg.length = A+3; | |
565 | for(var i = 0; i<C; i++) | |
566 | frame.reg[A+3+i] = rets[i]; | |
567 | if(frame.reg[A+3].type != "nil") | |
568 | frame.reg[A+2] = frame.reg[A+3]; | |
569 | else | |
570 | frame.pc++; // Skip JMP to start | |
571 | continue; | |
40
3a074ec1790f
Implement OP_TEST and OP_JMP
Matthew Wild <mwild1@gmail.com>
parents:
39
diff
changeset
|
572 | case OP_TEST: |
45
4d2cf0b5235d
Backed out changeset 741b953fcc5f (premature optimisations == bad)
Matthew Wild <mwild1@gmail.com>
parents:
42
diff
changeset
|
573 | var RA = frame.reg[INS_A(instruction)]; |
40
3a074ec1790f
Implement OP_TEST and OP_JMP
Matthew Wild <mwild1@gmail.com>
parents:
39
diff
changeset
|
574 | var RA_bool = RA.type == "nil" || (RA.type == "boolean" && RA.value == false); |
3a074ec1790f
Implement OP_TEST and OP_JMP
Matthew Wild <mwild1@gmail.com>
parents:
39
diff
changeset
|
575 | if(RA_bool == (INS_C(instruction)!=0)) |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
576 | frame.pc++; |
40
3a074ec1790f
Implement OP_TEST and OP_JMP
Matthew Wild <mwild1@gmail.com>
parents:
39
diff
changeset
|
577 | break; |
59 | 578 | case OP_TESTSET: |
579 | var RB = frame.reg[INS_B(instruction)]; | |
580 | var RB_bool = RB.type == "nil" || (RB.type == "boolean" && RB.value == false); | |
581 | if(RB_bool == (INS_C(instruction)!=0)) | |
582 | frame.pc++; | |
583 | else | |
584 | frame.reg[INS_A(instruction)] = RB; | |
585 | break; | |
40
3a074ec1790f
Implement OP_TEST and OP_JMP
Matthew Wild <mwild1@gmail.com>
parents:
39
diff
changeset
|
586 | case OP_JMP: |
41
70eb0eb5e7e8
Split LVM.run() into LVM.call()/LVM.run()
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
587 | frame.pc+=INS_sBx(instruction); |
40
3a074ec1790f
Implement OP_TEST and OP_JMP
Matthew Wild <mwild1@gmail.com>
parents:
39
diff
changeset
|
588 | break; |
101
f1247747f025
Implement OP_CONCAT (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
100
diff
changeset
|
589 | case OP_CONCAT: |
f1247747f025
Implement OP_CONCAT (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
100
diff
changeset
|
590 | var A = INS_A(instruction); |
f1247747f025
Implement OP_CONCAT (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
100
diff
changeset
|
591 | var B = INS_B(instruction); |
f1247747f025
Implement OP_CONCAT (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
100
diff
changeset
|
592 | var C = INS_C(instruction); |
f1247747f025
Implement OP_CONCAT (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
100
diff
changeset
|
593 | var values = []; |
f1247747f025
Implement OP_CONCAT (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
100
diff
changeset
|
594 | for(var i = B; i<=C; i++) |
f1247747f025
Implement OP_CONCAT (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
100
diff
changeset
|
595 | values.push(frame.reg[i].value); |
f1247747f025
Implement OP_CONCAT (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
100
diff
changeset
|
596 | frame.reg[A] = new LValue(this, "string", values.join()); |
58
40d0b0429428
Implement OP_ADD, OP_SUB, OP_LT
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
597 | case OP_ADD: |
77
ab8ff064d808
Add new RK() helper and fix OP_ADD to use it (so it loads constants properly)
Matthew Wild <mwild1@gmail.com>
parents:
76
diff
changeset
|
598 | var RB = RK(frame, INS_B(instruction)); |
ab8ff064d808
Add new RK() helper and fix OP_ADD to use it (so it loads constants properly)
Matthew Wild <mwild1@gmail.com>
parents:
76
diff
changeset
|
599 | var RC = RK(frame, INS_C(instruction)); |
72
dc73a60b3c06
Give LValue an add() method, to eventually respect metamethods
Matthew Wild <mwild1@gmail.com>
parents:
71
diff
changeset
|
600 | frame.reg[INS_A(instruction)] = RB.add(RC); |
58
40d0b0429428
Implement OP_ADD, OP_SUB, OP_LT
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
601 | break; |
40d0b0429428
Implement OP_ADD, OP_SUB, OP_LT
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
602 | case OP_SUB: |
95
c461e20b609a
Fix OP_SUB to use RK() too...
Matthew Wild <mwild1@gmail.com>
parents:
93
diff
changeset
|
603 | var RB = RK(frame, INS_B(instruction)); |
c461e20b609a
Fix OP_SUB to use RK() too...
Matthew Wild <mwild1@gmail.com>
parents:
93
diff
changeset
|
604 | var RC = RK(frame, INS_C(instruction)); |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
605 | frame.reg[INS_A(instruction)] = new LValue(this, "number", RB.value - RC.value); |
58
40d0b0429428
Implement OP_ADD, OP_SUB, OP_LT
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
606 | break; |
99
633e414a496c
Implement OP_DIV (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
98
diff
changeset
|
607 | case OP_DIV: |
633e414a496c
Implement OP_DIV (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
98
diff
changeset
|
608 | var RB = RK(frame, INS_B(instruction)); |
633e414a496c
Implement OP_DIV (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
98
diff
changeset
|
609 | var RC = RK(frame, INS_C(instruction)); |
633e414a496c
Implement OP_DIV (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
98
diff
changeset
|
610 | frame.reg[INS_A(instruction)] = new LValue(this, "number", RB.value / RC.value); |
633e414a496c
Implement OP_DIV (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
98
diff
changeset
|
611 | break; |
89
a9cef9e01154
Fix OP_LT to respect A, and move OP_EQ to live next to it in the switch() for readability
Matthew Wild <mwild1@gmail.com>
parents:
88
diff
changeset
|
612 | case OP_EQ: |
a9cef9e01154
Fix OP_LT to respect A, and move OP_EQ to live next to it in the switch() for readability
Matthew Wild <mwild1@gmail.com>
parents:
88
diff
changeset
|
613 | var A = INS_A(instruction); |
88 | 614 | var RB = RK(frame, INS_B(instruction)); |
615 | var RC = RK(frame, INS_C(instruction)); | |
89
a9cef9e01154
Fix OP_LT to respect A, and move OP_EQ to live next to it in the switch() for readability
Matthew Wild <mwild1@gmail.com>
parents:
88
diff
changeset
|
616 | if(RB.equals(RC) != (A!=0)) |
a9cef9e01154
Fix OP_LT to respect A, and move OP_EQ to live next to it in the switch() for readability
Matthew Wild <mwild1@gmail.com>
parents:
88
diff
changeset
|
617 | frame.pc++; |
a9cef9e01154
Fix OP_LT to respect A, and move OP_EQ to live next to it in the switch() for readability
Matthew Wild <mwild1@gmail.com>
parents:
88
diff
changeset
|
618 | break; |
a9cef9e01154
Fix OP_LT to respect A, and move OP_EQ to live next to it in the switch() for readability
Matthew Wild <mwild1@gmail.com>
parents:
88
diff
changeset
|
619 | case OP_LT: |
a9cef9e01154
Fix OP_LT to respect A, and move OP_EQ to live next to it in the switch() for readability
Matthew Wild <mwild1@gmail.com>
parents:
88
diff
changeset
|
620 | var A = INS_A(instruction); |
a9cef9e01154
Fix OP_LT to respect A, and move OP_EQ to live next to it in the switch() for readability
Matthew Wild <mwild1@gmail.com>
parents:
88
diff
changeset
|
621 | var RB = RK(frame, INS_B(instruction)); |
a9cef9e01154
Fix OP_LT to respect A, and move OP_EQ to live next to it in the switch() for readability
Matthew Wild <mwild1@gmail.com>
parents:
88
diff
changeset
|
622 | var RC = RK(frame, INS_C(instruction)); |
a9cef9e01154
Fix OP_LT to respect A, and move OP_EQ to live next to it in the switch() for readability
Matthew Wild <mwild1@gmail.com>
parents:
88
diff
changeset
|
623 | if(RB.value < RC.value != (A!=0)) |
58
40d0b0429428
Implement OP_ADD, OP_SUB, OP_LT
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
624 | frame.pc++; |
40d0b0429428
Implement OP_ADD, OP_SUB, OP_LT
Matthew Wild <mwild1@gmail.com>
parents:
56
diff
changeset
|
625 | break; |
90
40edbc05fbb9
Implement OP_LE (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
626 | case OP_LE: |
40edbc05fbb9
Implement OP_LE (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
627 | var A = INS_A(instruction); |
40edbc05fbb9
Implement OP_LE (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
628 | var RB = RK(frame, INS_B(instruction)); |
40edbc05fbb9
Implement OP_LE (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
629 | var RC = RK(frame, INS_C(instruction)); |
40edbc05fbb9
Implement OP_LE (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
630 | if(RB.value <= RC.value != (A!=0)) |
40edbc05fbb9
Implement OP_LE (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
631 | frame.pc++; |
40edbc05fbb9
Implement OP_LE (no metamethod yet)
Matthew Wild <mwild1@gmail.com>
parents:
89
diff
changeset
|
632 | break; |
0 | 633 | default: |
11
1b3267149cbd
Throw error on unhandled opcodes
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
634 | throw "Unhandled opcode: "+INS_OPCODE(instruction); |
0 | 635 | } |
636 | } | |
96
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
637 | }, |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
638 | registerLib: function (env, name, lib) |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
639 | { |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
640 | var t; |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
641 | if(name) |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
642 | { |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
643 | t = this.LValue({}); // Create env[name] and put fns in there |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
644 | env.setIndex(this.LValue(name), t); |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
645 | } |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
646 | else |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
647 | t = env; // Import directly into env |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
648 | |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
649 | for(var k in lib) |
e4324d9a824c
Add LVM().registerLib(env, name, lib) to register a table of native functions to an environment.
Matthew Wild <mwild1@gmail.com>
parents:
95
diff
changeset
|
650 | t.setIndex(this.LValue(k), this.LValue(lib[k])); |
0 | 651 | } |
652 | }; | |
653 | ||
56
d02c7932cbf2
Move try {} block so it covers more of the VM initialization
Matthew Wild <mwild1@gmail.com>
parents:
55
diff
changeset
|
654 | try{ |
0 | 655 | var testvm = new LVM(); |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
656 | |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
657 | var fs=require("fs"); |
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
658 | var sys=require("sys"); |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
659 | var c = new LBinaryChunk(testvm, fs.readFileSync("luac.out", "binary")); |
9
3f055c9ab80e
Add a bytecode interpreter \o/
Matthew Wild <mwild1@gmail.com>
parents:
8
diff
changeset
|
660 | |
97
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
661 | var _G = testvm.LValue({}); |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
662 | |
67
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
663 | // Standard library |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
664 | |
67
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
665 | var baselib = { |
74
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
666 | print: function () |
67
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
667 | { |
74
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
668 | var args = Array.prototype.slice.call(arguments); |
67
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
669 | sys.print(args[0].toString()); |
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
670 | for(var i = 1; i<args.length; i++) |
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
671 | sys.print("\t"+args[i].toString()); |
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
672 | sys.print("\n"); |
74
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
673 | return []; |
67
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
674 | }, |
74
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
675 | setmetatable: function (table, metatable) |
67
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
676 | { |
74
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
677 | if(arguments.length!=2) |
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
678 | throw "setmetatable expects 2 arguments, got "+arguments.length; |
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
679 | |
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
680 | table.setMetatable(metatable); |
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
681 | return [table]; |
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
682 | }, |
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
683 | type: function (o) |
a4a6adee1459
New Lua<->native function interface, simpler. Added type() to baselib.
Matthew Wild <mwild1@gmail.com>
parents:
73
diff
changeset
|
684 | { |
83
0e6b19731508
Fix type() in baselib to return an LValue
Matthew Wild <mwild1@gmail.com>
parents:
82
diff
changeset
|
685 | return [this.LValue(o.type)]; |
87
07d19518e89a
Add assert() to baselib, real tests possible at last
Matthew Wild <mwild1@gmail.com>
parents:
86
diff
changeset
|
686 | }, |
07d19518e89a
Add assert() to baselib, real tests possible at last
Matthew Wild <mwild1@gmail.com>
parents:
86
diff
changeset
|
687 | assert: function (expr, message) |
07d19518e89a
Add assert() to baselib, real tests possible at last
Matthew Wild <mwild1@gmail.com>
parents:
86
diff
changeset
|
688 | { |
07d19518e89a
Add assert() to baselib, real tests possible at last
Matthew Wild <mwild1@gmail.com>
parents:
86
diff
changeset
|
689 | if(!expr.truth()) |
07d19518e89a
Add assert() to baselib, real tests possible at last
Matthew Wild <mwild1@gmail.com>
parents:
86
diff
changeset
|
690 | throw message; |
07d19518e89a
Add assert() to baselib, real tests possible at last
Matthew Wild <mwild1@gmail.com>
parents:
86
diff
changeset
|
691 | return [expr]; |
67
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
692 | } |
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
693 | }; |
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
694 | |
97
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
695 | var math = { |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
696 | ldexp: function (m, e) |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
697 | { |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
698 | return [this.LValue(m.value*Math.pow(2, e.value))]; |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
699 | }, |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
700 | floor: function (x) |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
701 | { |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
702 | return [this.LValue(Math.floor(x.value))]; |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
703 | } |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
704 | }; |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
705 | |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
706 | testvm.registerLib(_G, null, baselib); |
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
707 | testvm.registerLib(_G, "math", math); |
67
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
708 | |
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
709 | // Metatable on environment to print out nil global accesses |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
710 | var mt = testvm.LValue({}); |
55
89ecee2cbad1
Add test __index handler to catch use of nil globals
Matthew Wild <mwild1@gmail.com>
parents:
54
diff
changeset
|
711 | mt.setIndex( |
73
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
712 | testvm.LValue("__index"), |
6b43d68abc94
Large overhaul - every LValue (and LBinaryChunk) now has a valid 'vm' property, so we know in which LVM to call it or its metamethods
Matthew Wild <mwild1@gmail.com>
parents:
72
diff
changeset
|
713 | testvm.LValue(function (t, k) { sys.puts("Access of nil global: "+k); }) |
55
89ecee2cbad1
Add test __index handler to catch use of nil globals
Matthew Wild <mwild1@gmail.com>
parents:
54
diff
changeset
|
714 | ); |
97
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
715 | _G.setMetatable(mt); |
67
782274d793ac
Formalise the beginnings of a baselib, add setmetatable.
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
716 | |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
717 | |
97
80cc68dd8222
Rename default_environment to _G, use registerLib() for baselib and add math lib with 2 ldexp, floor
Matthew Wild <mwild1@gmail.com>
parents:
96
diff
changeset
|
718 | var f = new LFunction(testvm, c, _G); |
2
253863ece36f
Implement OP_MOVE, OP_LOADNIL and OP_RETURN. Also change the way OP_CALL is implemented, and update the test code with a more complicated (kind of) sample.
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
719 | |
48 | 720 | var ret = testvm.call(f); |
721 | if(ret) | |
722 | sys.puts("Returned: "+sys.inspect(ret)); | |
29
62f3df8ed204
Remove rawExceptions flag, always print exception's stack trace if it has one
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
723 | } |
62f3df8ed204
Remove rawExceptions flag, always print exception's stack trace if it has one
Matthew Wild <mwild1@gmail.com>
parents:
28
diff
changeset
|
724 | catch(e) |
25
9e62bc13b30d
Add new debug option - rawExceptions - to prevent catching exceptions thrown by the VM, use for debugging the VM.
Matthew Wild <mwild1@gmail.com>
parents:
24
diff
changeset
|
725 | { |
93
748b51e8f0d6
Print out location at which errors occur, yay!
Matthew Wild <mwild1@gmail.com>
parents:
92
diff
changeset
|
726 | var currframe = testvm.callstack[testvm.callstack.length-1]; |
98
14d2400ec059
Don't try and print current position in the Lua script with no valid frame
Matthew Wild <mwild1@gmail.com>
parents:
97
diff
changeset
|
727 | if(currframe) |
14d2400ec059
Don't try and print current position in the Lua script with no valid frame
Matthew Wild <mwild1@gmail.com>
parents:
97
diff
changeset
|
728 | { |
14d2400ec059
Don't try and print current position in the Lua script with no valid frame
Matthew Wild <mwild1@gmail.com>
parents:
97
diff
changeset
|
729 | var currfunc = currframe.f; |
14d2400ec059
Don't try and print current position in the Lua script with no valid frame
Matthew Wild <mwild1@gmail.com>
parents:
97
diff
changeset
|
730 | sys.print("lvm.js: "+(currfunc.sourceName||"=<unknown>").substr(1)+":"+(currfunc.sourceLines[currframe.pc]||"<unknown>")+": "); |
14d2400ec059
Don't try and print current position in the Lua script with no valid frame
Matthew Wild <mwild1@gmail.com>
parents:
97
diff
changeset
|
731 | } |
93
748b51e8f0d6
Print out location at which errors occur, yay!
Matthew Wild <mwild1@gmail.com>
parents:
92
diff
changeset
|
732 | sys.puts(e); |
35
3de1d63ffdf7
Fix for error handling to handle string exceptions
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
733 | if(typeof(e) == "object" && "stack" in e) |
68
5b815d3591e2
Switch to sys.puts for all output for now, leaving browser compatibility for the moment.
Matthew Wild <mwild1@gmail.com>
parents:
67
diff
changeset
|
734 | sys.puts(e.stack); |
44
f5244bce28ce
Exit with failure code on error
Matthew Wild <mwild1@gmail.com>
parents:
43
diff
changeset
|
735 | process.exit(1); |
5 | 736 | } |