Mercurial > hg-old > index.cgi
annotate lwasm/lwasm.c @ 276:23034db7dd8a 2.5
fixed expression 'slots' to not store null on a pass 1 store
author | lost |
---|---|
date | Mon, 31 Aug 2009 08:39:36 +0000 |
parents | 97630727000e |
children |
rev | line source |
---|---|
0 | 1 /* |
4
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
2 lwasm.c |
55 | 3 Copyright © 2009 William Astle |
4
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
4 |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
5 This file is part of LWASM. |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
6 |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
7 LWASM is free software: you can redistribute it and/or modify it under the |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
8 terms of the GNU General Public License as published by the Free Software |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
9 Foundation, either version 3 of the License, or (at your option) any later |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
10 version. |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
11 |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
12 This program is distributed in the hope that it will be useful, but WITHOUT |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
15 more details. |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
16 |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
17 You should have received a copy of the GNU General Public License along with |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
18 this program. If not, see <http://www.gnu.org/licenses/>. |
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
19 |
26 | 20 |
21 Contains random functions used by the assembler | |
4
34568fab6058
Fixed package to include all required files; also added copyright preamble to all source files
lost
parents:
0
diff
changeset
|
22 */ |
0 | 23 |
26 | 24 #define __lwasm_c_seen__ |
212 | 25 #include <config.h> |
26 | 26 |
27 #include <stdarg.h> | |
0 | 28 #include <stdlib.h> |
26 | 29 #include <stdio.h> |
30 | |
0 | 31 #include "lwasm.h" |
26 | 32 #include "util.h" |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
33 #include "expr.h" |
0 | 34 |
38 | 35 int debug_level = 0; |
36 | |
26 | 37 int register_error(asmstate_t *as, lwasm_line_t *l, int pass, const char *fmt, ...) |
0 | 38 { |
26 | 39 lwasm_error_t *e; |
40 va_list args; | |
41 char errbuff[1024]; | |
42 int r; | |
0 | 43 |
143
0ee5f65bccf9
Added pragma to allow all undefined symbols to be considered external and also added a --pragma command line option
lost
parents:
101
diff
changeset
|
44 if (!l) |
0ee5f65bccf9
Added pragma to allow all undefined symbols to be considered external and also added a --pragma command line option
lost
parents:
101
diff
changeset
|
45 return; |
0ee5f65bccf9
Added pragma to allow all undefined symbols to be considered external and also added a --pragma command line option
lost
parents:
101
diff
changeset
|
46 |
26 | 47 if (as -> passnum != pass) |
48 return; | |
49 | |
50 va_start(args, fmt); | |
0 | 51 |
26 | 52 e = lwasm_alloc(sizeof(lwasm_error_t)); |
53 | |
54 e -> next = l -> err; | |
55 l -> err = e; | |
0 | 56 |
57 as -> errorcount++; | |
58 | |
26 | 59 r = vsnprintf(errbuff, 1024, fmt, args); |
60 e -> mess = lwasm_strdup(errbuff); | |
0 | 61 |
26 | 62 va_end(args); |
0 | 63 |
26 | 64 return r; |
0 | 65 } |
27
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
66 |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
67 void lwasm_emit(asmstate_t *as, lwasm_line_t *l, int b) |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
68 { |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
69 as -> addr += 1; |
58 | 70 as -> addr &= 0xffff; |
71 | |
74 | 72 if (as -> outformat == OUTPUT_OBJ && !(as -> csect)) |
73 { | |
74 register_error(as, l, 1, "Output not allowed outside sections with obj target"); | |
75 return; | |
76 } | |
77 if (as -> outformat == OUTPUT_OBJ && as -> csect -> flags & SECTION_BSS) | |
78 { | |
79 register_error(as, l, 1, "Output not allowed inside BSS sections"); | |
80 return; | |
81 } | |
236
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
82 |
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
83 if (as -> outformat == OUTPUT_OS9 && as -> inmod == 0) |
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
84 { |
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
85 register_error(as, l, 1, "Output not allowed outside of module in OS9 mode"); |
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
86 return; |
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
87 } |
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
88 |
27
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
89 if (as -> passnum == 1) |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
90 return; |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
91 |
42 | 92 |
93 if (l -> codelen >= l -> codesize) | |
94 { | |
95 l -> bytes = realloc(l -> bytes, l -> codesize + 16); | |
96 l -> codesize += 16; | |
97 } | |
98 l -> bytes[l -> codelen] = b & 0xff; | |
99 l -> codelen += 1; | |
236
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
100 |
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
101 if (as -> outformat == OUTPUT_OS9 && as -> inmod) |
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
102 { |
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
103 // calc the CRC |
239 | 104 // this is a direct transliteration from the nitros9 asm source |
105 // to C; it can, no doubt, be optimized for 32 bit processing | |
236
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
106 b &= 0xff; |
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
107 |
238 | 108 b ^= (as -> crc)[0]; |
109 (as -> crc)[0] = (as -> crc)[1]; | |
110 (as -> crc)[1] = (as -> crc)[2]; | |
111 (as -> crc)[1] ^= (b >> 7); | |
112 (as -> crc)[2] = (b << 1); | |
113 (as -> crc)[1] ^= (b >> 2); | |
114 (as -> crc)[2] ^= (b << 6); | |
115 b ^= (b << 1); | |
116 b ^= (b << 2); | |
117 b ^= (b << 4); | |
236
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
118 if (b & 0x80) |
238 | 119 { |
120 (as -> crc)[0] ^= 0x80; | |
121 (as -> crc)[2] ^= 0x21; | |
122 } | |
236
a58f49a77441
Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents:
212
diff
changeset
|
123 } |
27
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
124 } |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
125 |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
126 void lwasm_emitop(asmstate_t *as, lwasm_line_t *l, int o) |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
127 { |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
128 if (o >= 0x100) |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
129 lwasm_emit(as, l, o >> 8); |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
130 lwasm_emit(as, l, o & 0xff); |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
131 } |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
132 |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
133 int lwasm_lookupreg2(const char *reglist, char **str) |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
134 { |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
135 int rval = 0; |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
136 |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
137 while (*reglist) |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
138 { |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
139 if (toupper(**str) == *reglist) |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
140 { |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
141 // first char matches |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
142 if (reglist[1] == ' ' && !isalpha(*(*str + 1))) |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
143 break; |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
144 if (toupper(*(*str + 1)) == reglist[1]) |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
145 break; |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
146 } |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
147 reglist += 2; |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
148 rval++; |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
149 } |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
150 if (!*reglist) |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
151 return -1; |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
152 if (reglist[1] == ' ') |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
153 (*str)++; |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
154 else |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
155 (*str) += 2; |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
156 return rval; |
f736579569b4
Added handlers for inherent and register to register instructions
lost
parents:
26
diff
changeset
|
157 } |
32 | 158 |
159 int lwasm_lookupreg3(const char *rlist, const char **str) | |
160 { | |
161 int rval = 0; | |
162 int f = 0; | |
163 const char *reglist = rlist; | |
164 | |
165 while (*reglist) | |
166 { | |
167 if (toupper(**str) == *reglist) | |
168 { | |
169 // first char matches | |
170 if (reglist[1] == ' ') | |
171 { | |
172 f = 1; | |
173 break; | |
174 } | |
175 if (toupper(*(*str + 1)) == reglist[1]) | |
176 { | |
177 // second char matches | |
178 if (reglist[2] == ' ') | |
179 { | |
180 f = 1; | |
181 break; | |
182 } | |
183 if (toupper(*(*str + 2)) == reglist[2]) | |
184 { | |
185 f = 1; | |
186 break; | |
187 } | |
188 } | |
189 } | |
190 reglist += 3; | |
191 rval++; | |
192 } | |
193 if (f == 0) | |
194 return -1; | |
195 | |
196 | |
197 reglist = rval * 3 + rlist; | |
198 if (reglist[1] == ' ') | |
199 (*str) += 1; | |
200 else if (reglist[2] == ' ') | |
201 (*str) += 2; | |
202 else | |
203 (*str)+=3; | |
204 return rval; | |
205 } | |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
206 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
207 struct symstateinfo |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
208 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
209 asmstate_t *as; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
210 lwasm_line_t *l; |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
211 int flags; |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
212 }; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
213 |
76 | 214 lwasm_expr_stack_t *lwasm_expr_lookup_symbol(char *sym, void *state) |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
215 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
216 lwasm_symbol_ent_t *se; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
217 struct symstateinfo *st; |
76 | 218 lwasm_expr_stack_t *rs; |
219 lwasm_expr_term_t *t; | |
220 lwasm_expr_stack_node_t *n; | |
221 | |
222 int val; | |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
223 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
224 st = state; |
52 | 225 debug_message(3, "lwasm_expr_lookup_symbol(): find '%s' (context=%d)", sym, st -> as -> context); |
226 | |
60 | 227 // check for special symbols first... |
228 if (sym[1] == '\0') | |
229 { | |
230 switch (sym[0]) | |
231 { | |
232 // current line address | |
233 case '*': | |
234 case '.': | |
76 | 235 val = st -> l -> codeaddr; |
236 goto retconst; | |
60 | 237 |
238 case '<': | |
239 // previous branch point | |
240 // not implemented | |
241 break; | |
242 case '>': | |
243 // next branch point | |
244 // not implemented | |
245 break; | |
246 } | |
247 } | |
248 | |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
249 // look for local symbol first then global symbol |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
250 se = lwasm_find_symbol(st -> as, sym, st -> as -> context); |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
251 if (!se) |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
252 se = lwasm_find_symbol(st -> as, sym, -1); |
52 | 253 debug_message(3, "lwasm_expr_lookup_symbol(): got '%p'", se); |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
254 if (!se) |
77 | 255 { |
256 register_error(st -> as, st -> l, 2, "Undefined symbol '%s'", sym); | |
76 | 257 return NULL; |
77 | 258 } |
92
ea2cfebef5d0
Make external symbols remain unresolved in expressions and also flag them in the symbol list
lost
parents:
84
diff
changeset
|
259 // external reference - can not resolve it |
ea2cfebef5d0
Make external symbols remain unresolved in expressions and also flag them in the symbol list
lost
parents:
84
diff
changeset
|
260 if (se -> flags & SYMBOL_EXTERN) |
ea2cfebef5d0
Make external symbols remain unresolved in expressions and also flag them in the symbol list
lost
parents:
84
diff
changeset
|
261 { |
ea2cfebef5d0
Make external symbols remain unresolved in expressions and also flag them in the symbol list
lost
parents:
84
diff
changeset
|
262 return NULL; |
ea2cfebef5d0
Make external symbols remain unresolved in expressions and also flag them in the symbol list
lost
parents:
84
diff
changeset
|
263 } |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
264 if (st -> flags & EXPR_SECTCONST) |
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
265 { |
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
266 if (se -> sect == st -> l -> sect) |
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
267 { |
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
268 if (se -> expr) |
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
269 goto retsym; |
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
270 val = se -> value; |
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
271 goto retconst; |
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
272 } |
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
273 } |
93
34ca1c6e9550
Fixed symbol resolution to not resolve intra-section references to constants by default
lost
parents:
92
diff
changeset
|
274 if (st -> as -> outformat == OUTPUT_OBJ && se -> sect != NULL) |
34ca1c6e9550
Fixed symbol resolution to not resolve intra-section references to constants by default
lost
parents:
92
diff
changeset
|
275 { |
34ca1c6e9550
Fixed symbol resolution to not resolve intra-section references to constants by default
lost
parents:
92
diff
changeset
|
276 return NULL; |
34ca1c6e9550
Fixed symbol resolution to not resolve intra-section references to constants by default
lost
parents:
92
diff
changeset
|
277 } |
34ca1c6e9550
Fixed symbol resolution to not resolve intra-section references to constants by default
lost
parents:
92
diff
changeset
|
278 if (st -> as -> outformat != OUTPUT_OBJ || se -> sect == NULL) |
76 | 279 { |
280 // global symbol, intrasegment reference, or not an object target | |
281 val = se -> value; | |
282 goto retconst; | |
283 } | |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
284 |
76 | 285 // an intersegment reference will return as NULL (to be resolved at output/link time) |
286 // if se -> expr is NULL, it has to be an intersegment reference here | |
287 if (se -> expr == NULL) | |
288 { | |
289 return NULL; | |
290 } | |
291 | |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
292 retsym: |
76 | 293 // duplicate the expression for return |
294 rs = lwasm_expr_stack_create(); | |
295 for (n = se -> expr -> head; n; n = n -> next) | |
296 { | |
297 lwasm_expr_stack_push(rs, n -> term); | |
298 } | |
299 return rs; | |
300 | |
301 retconst: | |
302 rs = lwasm_expr_stack_create(); | |
303 t = lwasm_expr_term_create_int(val); | |
304 lwasm_expr_stack_push(rs, t); | |
305 lwasm_expr_term_free(t); | |
306 return rs; | |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
307 } |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
308 |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
309 lwasm_expr_stack_t *lwasm_evaluate_expr(asmstate_t *as, lwasm_line_t *l, const char *inp, const char **outp, int flags) |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
310 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
311 struct symstateinfo st; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
312 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
313 st.as = as; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
314 st.l = l; |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
315 st.flags = flags; |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
316 |
38 | 317 debug_message(2, "Evaluate expression: %s", inp); |
318 | |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
319 return(lwasm_expr_eval(inp, outp, lwasm_expr_lookup_symbol, &st)); |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
32
diff
changeset
|
320 } |
38 | 321 |
77 | 322 |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
323 int lwasm_reevaluate_expr(asmstate_t *as, lwasm_line_t *l, lwasm_expr_stack_t *s, int flags) |
77 | 324 { |
325 struct symstateinfo st; | |
326 | |
327 st.as = as; | |
328 st.l = l; | |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
329 st.flags = flags; |
77 | 330 return(lwasm_expr_reval(s, lwasm_expr_lookup_symbol, &st)); |
331 } | |
332 | |
76 | 333 // return 1 if no undefined symbols (externals and incompletes are okay) |
334 // return 0 if there are undefined symbols | |
335 int lwasm_expr_result_ckconst(asmstate_t *as, lwasm_expr_stack_t *s) | |
336 { | |
337 lwasm_expr_stack_node_t *n; | |
338 lwasm_symbol_ent_t *se; | |
339 | |
77 | 340 if (as -> outformat != OUTPUT_OBJ) |
341 { | |
342 if (lwasm_expr_is_constant(s)) | |
343 return 1; | |
344 else | |
345 return 0; | |
346 } | |
347 | |
76 | 348 for (n = s -> head; n; n = n -> next) |
349 { | |
350 if (n -> term -> term_type == LWASM_TERM_SYM) | |
351 { | |
352 se = lwasm_find_symbol(as, n -> term -> symbol, as -> context); | |
353 if (!se) | |
354 se = lwasm_find_symbol(as, n -> term -> symbol, -1); | |
355 if (!se) | |
356 return 0; | |
357 } | |
358 } | |
359 return 1; | |
360 } | |
361 | |
362 /* | |
363 Evaluate an expression according to the flag value. Return 0 if a constant result was | |
364 obtained, 1 if an incomplete result was obtained, and -1 if an error was flagged. | |
365 | |
77 | 366 */ |
367 int lwasm_expr_result2(asmstate_t *as, lwasm_line_t *l, char **inp, int flag, int *val, int slot) | |
368 { | |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
369 lwasm_expr_stack_t *s = NULL; |
77 | 370 const char *ep; |
371 int rval; | |
372 | |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
373 if ((as -> passnum == 1 && !(flag & EXPR_REEVAL)) || slot < 0) |
77 | 374 { |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
375 s = lwasm_evaluate_expr(as, l, *inp, &ep, flag); |
275
97630727000e
fixed expression 'slots' to not store null on a pass 1 store
lost
parents:
239
diff
changeset
|
376 // if (!ep) |
97630727000e
fixed expression 'slots' to not store null on a pass 1 store
lost
parents:
239
diff
changeset
|
377 // ep = *inp; |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
378 if (slot >= 0) |
275
97630727000e
fixed expression 'slots' to not store null on a pass 1 store
lost
parents:
239
diff
changeset
|
379 { |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
380 l -> exprs[slot] = s; |
275
97630727000e
fixed expression 'slots' to not store null on a pass 1 store
lost
parents:
239
diff
changeset
|
381 l -> exprends[slot] = ep; |
97630727000e
fixed expression 'slots' to not store null on a pass 1 store
lost
parents:
239
diff
changeset
|
382 } |
77 | 383 if (!s) |
384 { | |
385 register_error(as, l, 1, "Bad expression"); | |
386 *val = 0; | |
387 return -1; | |
388 } | |
389 *inp = (char *)ep; | |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
390 if (slot >= 0) |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
391 { |
275
97630727000e
fixed expression 'slots' to not store null on a pass 1 store
lost
parents:
239
diff
changeset
|
392 // l -> exprends[slot] = (char *)ep; |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
393 l -> exprvals[slot] = lwasm_expr_get_value(s); |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
394 } |
77 | 395 } |
396 else if (l -> exprs[slot]) | |
397 { | |
398 s = l -> exprs[slot]; | |
101
f59c0916753d
Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents:
98
diff
changeset
|
399 lwasm_reevaluate_expr(as, l, s, flag); |
77 | 400 l -> exprvals[slot] = lwasm_expr_get_value(s); |
401 } | |
84
e12edcfbebd5
Fixed problem with expression evaluation infrastructure not advancing input pointer on pass 2
lost
parents:
79
diff
changeset
|
402 if (as -> passnum == 2 && slot >= 0) |
e12edcfbebd5
Fixed problem with expression evaluation infrastructure not advancing input pointer on pass 2
lost
parents:
79
diff
changeset
|
403 *inp = l -> exprends[slot]; |
77 | 404 |
405 if (s && lwasm_expr_is_constant(s)) | |
406 { | |
94
83ba34ed11b3
Fixed problem with constant expressions evaluating to 0 when they shouldn't
lost
parents:
93
diff
changeset
|
407 *val = lwasm_expr_get_value(s); |
77 | 408 lwasm_expr_stack_free(s); |
409 l -> exprs[slot] = NULL; | |
410 s = NULL; | |
94
83ba34ed11b3
Fixed problem with constant expressions evaluating to 0 when they shouldn't
lost
parents:
93
diff
changeset
|
411 return 0; |
77 | 412 } |
413 | |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
414 if (!s && slot >= 0) |
77 | 415 { |
416 *val = l -> exprvals[slot]; | |
417 return 0; | |
418 } | |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
419 else if (!s) |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
420 { |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
421 *val = 0; |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
422 return 0; |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
423 } |
78
121bf4a588ea
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
424 |
121bf4a588ea
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
425 // was a constant result on pass 1 requested? |
121bf4a588ea
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
426 // that means we must have a constant on either pass |
121bf4a588ea
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
427 if (flag & EXPR_PASS1CONST) |
121bf4a588ea
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
428 { |
121bf4a588ea
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
429 *val = 0; |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
430 if (slot >= 0) |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
431 l -> exprvals[slot] = 0; |
78
121bf4a588ea
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
432 register_error(as, l, 1, "Illegal forward, external, or inter-section reference"); |
121bf4a588ea
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
433 lwasm_expr_stack_free(s); |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
434 if (slot >= 0) |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
78
diff
changeset
|
435 l -> exprs[slot] = NULL; |
78
121bf4a588ea
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
436 return -1; |
121bf4a588ea
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
437 } |
77 | 438 |
439 return 1; | |
440 } | |
55 | 441 |
38 | 442 void debug_message(int level, const char *fmt, ...) |
443 { | |
444 va_list args; | |
445 | |
446 va_start(args, fmt); | |
447 if (debug_level >= level) | |
448 { | |
39 | 449 if (level > 0) |
450 fprintf(stderr, "DEBUG %d: ", level); | |
38 | 451 vfprintf(stderr, fmt, args); |
452 fputc('\n', stderr); | |
453 } | |
454 va_end(args); | |
455 } | |
57 | 456 |
457 int lwasm_next_context(asmstate_t *as) | |
458 { | |
58 | 459 int r; |
460 r = as -> nextcontext; | |
461 as -> nextcontext += 1; | |
462 debug_message(3, "lwasm_next_context(): %d (%d) pass %d", r, as -> nextcontext, as -> passnum); | |
463 return r; | |
57 | 464 } |
465 |