annotate src/expr.c @ 41:7eafdb3a8074

Fixed symbol parsing to prevent string overflow
author lost
date Sat, 03 Jan 2009 19:50:30 +0000
parents d2cee0c335e7
children 2330b88f9600
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
1 /*
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
2 expr.c
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
3 Copyright © 2008 William Astle
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
4
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
5 This file is part of LWASM.
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
6
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
7 LWASM is free software: you can redistribute it and/or modify it under the
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
8 terms of the GNU General Public License as published by the Free Software
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
9 Foundation, either version 3 of the License, or (at your option) any later
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
10 version.
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
11
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
12 This program is distributed in the hope that it will be useful, but WITHOUT
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
15 more details.
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
16
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
17 You should have received a copy of the GNU General Public License along with
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
18 this program. If not, see <http://www.gnu.org/licenses/>.
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
19 */
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
20
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
21 /*
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
22 This file contains the actual expression evaluator
13
05d4115b4860 Started work on new expression evaluator system and major code re-work for next release
lost
parents:
diff changeset
23 */
14
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
24
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
25 #define __expr_c_seen__
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
26
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
27 #include <ctype.h>
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
28 #include <stdlib.h>
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
29 #include <string.h>
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
30
14
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
31 #include "expr.h"
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
32 #include "util.h"
40
d2cee0c335e7 adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents: 39
diff changeset
33 #include "lwasm.h"
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
34
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
35 lwasm_expr_stack_t *lwasm_expr_stack_create(void)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
36 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
37 lwasm_expr_stack_t *s;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
38
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
39 s = lwasm_alloc(sizeof(lwasm_expr_stack_t));
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
40 s -> head = NULL;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
41 s -> tail = NULL;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
42 return s;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
43 }
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
44
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
45 void lwasm_expr_stack_free(lwasm_expr_stack_t *s)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
46 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
47 while (s -> head)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
48 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
49 s -> tail = s -> head;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
50 s -> head = s -> head -> next;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
51 lwasm_expr_term_free(s -> tail -> term);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
52 lwasm_free(s -> tail);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
53 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
54 lwasm_free(s);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
55 }
14
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
56
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
57 void lwasm_expr_term_free(lwasm_expr_term_t *t)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
58 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
59 if (t)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
60 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
61 if (t -> symbol)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
62 lwasm_free(t -> symbol);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
63 lwasm_free(t);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
64 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
65 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
66
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
67 lwasm_expr_term_t *lwasm_expr_term_create_oper(int oper)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
68 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
69 lwasm_expr_term_t *t;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
70
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
71 debug_message(10, "Creating operator term: %d", oper);
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
72
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
73 t = lwasm_alloc(sizeof(lwasm_expr_term_t));
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
74 t -> term_type = LWASM_TERM_OPER;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
75 t -> value = oper;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
76 return t;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
77 }
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
78
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
79 lwasm_expr_term_t *lwasm_expr_term_create_int(int val)
14
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
80 {
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
81 lwasm_expr_term_t *t;
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
82 debug_message(10, "Creating integer term: %d", val);
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
83
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
84 t = lwasm_alloc(sizeof(lwasm_expr_term_t));
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
85 t -> term_type = LWASM_TERM_INT;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
86 t -> value = val;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
87 return t;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
88 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
89
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
90 lwasm_expr_term_t *lwasm_expr_term_create_sym(char *sym)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
91 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
92 lwasm_expr_term_t *t;
14
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
93
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
94 debug_message(10, "Creating symbol term: %s", sym);
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
95
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
96 t = lwasm_alloc(sizeof(lwasm_expr_term_t));
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
97 t -> term_type = LWASM_TERM_SYM;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
98 t -> symbol = lwasm_strdup(sym);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
99 return t;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
100 }
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
101
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
102 lwasm_expr_term_t *lwasm_expr_term_dup(lwasm_expr_term_t *t)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
103 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
104 switch (t -> term_type)
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
105 {
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
106 case LWASM_TERM_INT:
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
107 return lwasm_expr_term_create_int(t -> value);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
108
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
109 case LWASM_TERM_OPER:
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
110 return lwasm_expr_term_create_oper(t -> value);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
111
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
112 case LWASM_TERM_SYM:
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
113 return lwasm_expr_term_create_sym(t -> symbol);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
114
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
115 default:
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
116 debug_message(0, "lwasm_expr_term_dup(): invalid term type %d", t -> term_type);
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
117 exit(1);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
118 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
119 // can't get here
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
120 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
121
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
122 void lwasm_expr_stack_push(lwasm_expr_stack_t *s, lwasm_expr_term_t *t)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
123 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
124 lwasm_expr_stack_node_t *n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
125
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
126 if (!s)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
127 {
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
128 debug_message(0, "lwasm_expr_stack_push(): invalid stack pointer");
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
129 exit(1);
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
130 }
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
131
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
132 n = lwasm_alloc(sizeof(lwasm_expr_stack_node_t));
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
133 n -> next = NULL;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
134 n -> prev = s -> tail;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
135 n -> term = lwasm_expr_term_dup(t);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
136
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
137 if (s -> head)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
138 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
139 s -> tail -> next = n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
140 s -> tail = n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
141 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
142 else
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
143 {
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
144 s -> head = n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
145 s -> tail = n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
146 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
147 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
148
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
149 lwasm_expr_term_t *lwasm_expr_stack_pop(lwasm_expr_stack_t *s)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
150 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
151 lwasm_expr_term_t *t;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
152 lwasm_expr_stack_node_t *n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
153
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
154 if (!(s -> tail))
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
155 return NULL;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
156
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
157 n = s -> tail;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
158 s -> tail = n -> prev;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
159 if (!(n -> prev))
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
160 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
161 s -> head = NULL;
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
162 }
14
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
163
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
164 t = n -> term;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
165 n -> term = NULL;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
166
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
167 lwasm_free(n);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
168
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
169 return t;
14
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
170 }
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
171
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
172 // the following two functions are co-routines which actually parse
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
173 // an infix expression onto the expression stack, each returns -1
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
174 // if an error is encountered
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
175
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
176 /*
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
177 parse a term and push it onto the stack
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
178
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
179 this function handles unary prefix operators (-, +, .not., .com.)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
180 as well as ()
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
181 */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
182 int lwasm_expr_parse_term(lwasm_expr_stack_t *s, const char **p)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
183 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
184 lwasm_expr_term_t *t;
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
185 debug_message(2, "Expression string %s", *p);
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
186
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
187 eval_next:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
188 if (**p == '(')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
189 {
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
190 debug_message(3, "Starting paren");
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
191 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
192 lwasm_expr_parse_expr(s, p, 0);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
193 if (**p != ')')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
194 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
195 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
196 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
197 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
198
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
199 if (**p == '+')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
200 {
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
201 debug_message(3, "Unary +");
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
202 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
203 goto eval_next;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
204 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
205
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
206 if (**p == '-')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
207 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
208 // parse expression following "-"
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
209 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
210 if (lwasm_expr_parse_expr(s, p, 200) < 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
211 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
212 t = lwasm_expr_term_create_oper(LWASM_OPER_NEG);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
213 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
214 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
215 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
216 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
217
23
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
218 if (**p == '^')
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
219 {
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
220 // parse expression following "^"
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
221 (*p)++;
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
222 if (lwasm_expr_parse_expr(s, p, 200) < 0)
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
223 return -1;
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
224 t = lwasm_expr_term_create_oper(LWASM_OPER_COM);
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
225 lwasm_expr_stack_push(s, t);
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
226 lwasm_expr_term_free(t);
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
227 return 0;
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
228 }
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
229
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
230 /*
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
231 we have an actual term here so evaluate it
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
232
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
233 it could be one of the following:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
234
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
235 1. a decimal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
236 2. a hexadecimal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
237 3. an octal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
238 4. a binary constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
239 5. a symbol reference
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
240 6. the "current" instruction address (*)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
241 7. the "current" data address (.)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
242 8. a "back reference" (<)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
243 9. a "forward reference" (>)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
244
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
245 items 6 through 9 are stored as symbol references
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
246
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
247 (a . followed by a . or a alpha char or number is a symbol)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
248 */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
249 if (**p == '*'
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
250 || (
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
251 **p == '.'
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
252 && (*p)[1] != '.'
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
253 && !((*p)[1] >= 'A' && (*p)[1] <= 'Z')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
254 && !((*p)[1] >= 'a' && (*p)[1] <= 'z')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
255 && !((*p)[1] >= '0' && (*p)[1] <= '9')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
256 )
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
257 || **p == '<'
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
258 || **p == '>')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
259 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
260 char tstr[2];
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
261 tstr[0] = **p;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
262 tstr[1] = '\0';
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
263 t = lwasm_expr_term_create_sym(tstr);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
264 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
265 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
266 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
267 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
268 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
269
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
270 /*
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
271 - a symbol will be a string of characters introduced by a letter, ".",
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
272 "_" but NOT a number
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
273 - a decimal constant will consist of only digits, optionally prefixed
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
274 with "&"
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
275 - a binary constant will consist of only 0s and 1s either prefixed with %
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
276 or suffixed with "B"
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
277 - a hex constant will consist of 0-9A-F either prefixed with $ or
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
278 suffixed with "H"; a hex number starting with A-F must be prefixed
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
279 with $ or start with 0 and end with H
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
280 - an octal constant will consist of 0-7 either prefixed with @ or
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
281 suffixed with "O" or "Q"
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
282 - an ascii constant will be a single character prefixed with a '
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
283 - a double ascii constant will be two characters prefixed with a "
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
284
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
285 */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
286 if (**p == '"')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
287 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
288 // double ascii constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
289 int val;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
290 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
291 if (!**p)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
292 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
293 if (!*((*p)+1))
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
294 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
295 val = **p << 8 | *((*p) + 1);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
296 (*p) += 2;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
297 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
298 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
299 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
300 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
301 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
302 else if (**p == '\'')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
303 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
304 // single ascii constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
305 int val;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
306 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
307 if (!**p)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
308 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
309 val = **p;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
310 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
311 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
312 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
313 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
314 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
315 else if (**p == '&')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
316 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
317 // decimal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
318 int val = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
319
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
320 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
321 while (strchr("0123456789", **p))
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
322 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
323 val = val * 10 + (**p - '0');
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
324 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
325 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
326 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
327 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
328 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
329 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
330 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
331 else if (**p == '%')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
332 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
333 // binary constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
334 int val = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
335
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
336 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
337 while (**p == '0' || **p == '1')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
338 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
339 val = val * 2 + (**p - '0');
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
340 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
341 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
342 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
343 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
344 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
345 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
346 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
347 else if (**p == '$')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
348 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
349 // hexadecimal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
350 int val = 0, val2;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
351
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
352 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
353 while (strchr("0123456789ABCDEFabcdef", **p))
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
354 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
355 val2 = toupper(**p) - '0';
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
356 if (val2 > 9)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
357 val2 -= 7;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
358 val = val * 16 + val2;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
359 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
360 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
361 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
362 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
363 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
364 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
365 }
40
d2cee0c335e7 adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents: 39
diff changeset
366 // an @ followed by a digit is an octal number
d2cee0c335e7 adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents: 39
diff changeset
367 // but if it's followed by anything else, it is a symbol
d2cee0c335e7 adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents: 39
diff changeset
368 else if (**p == '@' && isdigit(*(*p + 1)))
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
369 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
370 // octal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
371 int val = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
372
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
373 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
374 while (strchr("01234567", **p))
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
375 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
376 val = val * 8 + (**p - '0');
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
377 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
378 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
379 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
380 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
381 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
382 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
383 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
384
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
385 // symbol or bare decimal or suffix identified constant here
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
386 // all numbers will start with a digit at this point
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
387 if (**p < '0' || **p > '9')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
388 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
389 int l = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
390 char *sb;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
391
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
392 // evaluate a symbol here
41
7eafdb3a8074 Fixed symbol parsing to prevent string overflow
lost
parents: 40
diff changeset
393 static const char *symchars = "_.$@?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
7eafdb3a8074 Fixed symbol parsing to prevent string overflow
lost
parents: 40
diff changeset
394 while ((*p)[l] && strchr(symchars, (*p)[l]))
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
395 l++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
396
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
397 if (l == 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
398 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
399
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
400 sb = lwasm_alloc(l + 1);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
401 sb[l] = '\0';
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
402 memcpy(sb, *p, l);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
403 t = lwasm_expr_term_create_sym(sb);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
404 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
405 lwasm_expr_term_free(t);
41
7eafdb3a8074 Fixed symbol parsing to prevent string overflow
lost
parents: 40
diff changeset
406 (*p) += l;
7eafdb3a8074 Fixed symbol parsing to prevent string overflow
lost
parents: 40
diff changeset
407 debug_message(3, "Symbol: '%s'; (%s)", sb, *p);
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
408 lwasm_free(sb);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
409 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
410 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
411
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
412 if (!**p)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
413 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
414
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
415 // evaluate a suffix based constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
416 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
417 int decval = 0, binval = 0, hexval = 0, octval = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
418 int valtype = 15; // 1 = bin, 2 = oct, 4 = dec, 8 = hex
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
419 int bindone = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
420 int val;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
421 int dval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
422
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
423 while (1)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
424 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
425 if (!**p || !strchr("0123456789ABCDEFabcdefqhoQHO", **p))
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
426 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
427 // we can legally have bin or decimal here
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
428 if (bindone)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
429 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
430 // we just finished a binary value
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
431 val = binval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
432 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
433 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
434 else if (valtype & 4)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
435 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
436 // otherwise we must be decimal (if we're still allowed one)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
437 val = decval;
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
438 debug_message(3, "End of decimal value");
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
439 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
440 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
441 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
442 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
443 // bad value
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
444 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
445 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
446 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
447
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
448 dval = toupper(**p);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
449 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
450
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
451 if (bindone)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
452 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
453 // any characters past "B" means it is not binary
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
454 bindone = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
455 valtype &= 14;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
456 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
457
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
458 switch (dval)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
459 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
460 case 'Q':
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
461 case 'O':
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
462 if (valtype & 2)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
463 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
464 val = octval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
465 valtype = -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
466 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
467 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
468 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
469 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
470 // not a valid octal value
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
471 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
472 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
473 /* can't get here */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
474
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
475 case 'H':
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
476 if (valtype & 8)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
477 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
478 val = hexval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
479 valtype = -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
480 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
481 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
482 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
483 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
484 // not a valid hex number
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
485 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
486 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
487 /* can't get here */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
488
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
489 case 'B':
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
490 // this is a bit of a sticky one since B is a legit hex
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
491 // digit so this may or may not be the end of the number
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
492 // so we fall through to the digit case
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
493
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
494 if (valtype & 1)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
495 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
496 // could still be binary
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
497 bindone = 1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
498 valtype = 9; // hex and binary
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
499 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
500 /* fall through intentional */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
501
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
502 default:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
503 // digit
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
504 dval -= '0';
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
505 if (dval > 9)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
506 dval -= 7;
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
507 debug_message(3, "Got digit: %d", dval);
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
508 // if (dval > 1)
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
509 // valtype &= 14;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
510 // if (dval > 7)
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
511 // valtype &= 12;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
512 // if (dval > 9)
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
513 // valtype &= 8;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
514
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
515 if (valtype & 8)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
516 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
517 hexval = hexval * 16 + dval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
518 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
519 if (valtype & 4)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
520 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
521 if (dval > 9)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
522 valtype &= 11;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
523 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
524 decval = decval * 10 + dval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
525 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
526 if (valtype & 2)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
527 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
528 if (dval > 7)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
529 valtype &= 13;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
530 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
531 octval = octval * 8 + dval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
532 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
533 if (valtype & 1)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
534 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
535 if (dval > 1)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
536 valtype &= 14;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
537 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
538 binval = binval * 2 + dval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
539 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
540 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
541 // break out if we have a return value
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
542 if (valtype == -1)
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
543 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
544 // return if no more valid possibilities!
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
545 if (valtype == 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
546 return -1;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
547 val = decval; // in case we fall through
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
548 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
549
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
550 // we get here when we have a value to return
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
551 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
552 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
553 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
554 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
555 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
556 /* can't get here */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
557 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
558
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
559 // parse an expression and push the result onto the stack
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
560 // if an operator of lower precedence than the value of "prec" is found,
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
561 int lwasm_expr_parse_expr(lwasm_expr_stack_t *s, const char **p, int prec)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
562 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
563 static const struct operinfo
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
564 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
565 int opernum;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
566 char *operstr;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
567 int operprec;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
568 } operators[] =
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
569 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
570 { LWASM_OPER_PLUS, "+", 100 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
571 { LWASM_OPER_MINUS, "-", 100 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
572 { LWASM_OPER_TIMES, "*", 150 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
573 { LWASM_OPER_DIVIDE, "/", 150 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
574 { LWASM_OPER_MOD, "%", 150 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
575 { LWASM_OPER_INTDIV, "\\", 150 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
576
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
577 { LWASM_OPER_NONE, "", 0 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
578 };
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
579 int opern, i;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
580 lwasm_expr_term_t *operterm;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
581
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
582 // return if we are at the end of the expression or a subexpression
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
583 if (!**p || isspace(**p) || **p == ')' || **p == ',')
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
584 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
585
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
586 if (lwasm_expr_parse_term(s, p) < 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
587 return -1;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
588
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
589 eval_next:
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
590 if (!**p || isspace(**p) || **p == ')' || **p == ',')
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
591 return 0;
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
592
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
593 // expecting an operator here
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
594 for (opern = 0; operators[opern].opernum != LWASM_OPER_NONE; opern++)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
595 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
596 for (i = 0; (*p)[i] && operators[opern].operstr[i] && (*p[i] == operators[opern].operstr[i]); i++)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
597 /* do nothing */ ;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
598 if (operators[opern].operstr[i] == '\0')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
599 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
600 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
601 if (operators[opern].opernum == LWASM_OPER_NONE)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
602 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
603 // unrecognized operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
604 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
605 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
606
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
607 // the operator number in question is in opern; i is the length of the
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
608 // operator string
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
609
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
610 // logic:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
611 // if the precedence of this operation is <= to the "prec" flag,
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
612 // we simply return without advancing the input pointer; the operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
613 // will be evaluated again in the enclosing function call
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
614 if (operators[opern].operprec <= prec)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
615 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
616
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
617 // logic:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
618 // we have a higher precedence operator here so we will advance the
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
619 // input pointer to the next term and let the expression evaluator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
620 // loose on it after which time we will push our operator onto the
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
621 // stack and then go on with the expression evaluation
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
622 (*p) += i; // advance input pointer
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
623
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
624 // evaluate next expression(s) of higher precedence
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
625 if (lwasm_expr_parse_expr(s, p, operators[opern].operprec) < 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
626 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
627
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
628 operterm = lwasm_expr_term_create_oper(operators[opern].opernum);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
629 lwasm_expr_stack_push(s, operterm);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
630 lwasm_expr_term_free(operterm);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
631
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
632 // return if we are at the end of the expression or a subexpression
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
633 if (!**p || isspace(**p) || **p == ')')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
634 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
635
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
636 // continue evaluating
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
637 goto eval_next;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
638 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
639
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
640 /*
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
641 actually evaluate an expression
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
642
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
643 This happens in two stages. The first stage merely parses the expression into
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
644 a lwasm_expr_stack_t * which is then evaluated as much as possible before the
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
645 result is returned.
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
646
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
647 Returns NULL on a parse error or otherwise invalid expression. *outp will
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
648 contain the pointer to the next character after the expression if and only
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
649 if there is no error. In the case of an error, *outp is undefined.
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
650 */
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
651 lwasm_expr_stack_t *lwasm_expr_eval(const char *inp, const char **outp, int (*sfunc)(char *sym, void *state, int *val), void *state)
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
652 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
653 lwasm_expr_stack_t *s;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
654 const char *p;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
655 int rval;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
656
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
657 // actually parse the expression
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
658 p = inp;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
659 s = lwasm_expr_stack_create();
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
660
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
661 rval = lwasm_expr_parse_expr(s, &p, 0);
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
662 if (rval < 0)
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
663 goto cleanup_error;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
664
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
665 // save end of expression
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
666 if (outp)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
667 (*outp) = p;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
668
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
669 // return potentially partial expression
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
670 if (lwasm_expr_reval(s, sfunc, state) < 0)
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
671 goto cleanup_error;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
672
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
673 if (lwasm_expr_is_constant(s))
39
efa19ec69df9 tweaked debugging system for expression handler
lost
parents: 37
diff changeset
674 debug_message(3, "Constant expression evaluates to: %d", lwasm_expr_get_value(s));
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
675
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
676 return s;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
677
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
678 cleanup_error:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
679 lwasm_expr_stack_free(s);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
680 return NULL;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
681 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
682
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
683 /*
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
684 take an expression stack s and scan for operations that can be completed
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
685
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
686 return -1 on error, 0 on no error
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
687
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
688 possible errors are: division by zero or unknown operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
689
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
690 theory of operation:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
691
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
692 scan the stack for an operator which has two constants preceding it (binary)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
693 or 1 constant preceding it (unary) and if found, perform the calculation
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
694 and replace the operator and its operands with the result
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
695
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
696 repeat the scan until no futher simplications are found or if there are no
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
697 further operators or only a single term remains
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
698
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
699 */
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
700 int lwasm_expr_reval(lwasm_expr_stack_t *s, int (*sfunc)(char *sym, void *state, int *val), void *state)
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
701 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
702 lwasm_expr_stack_node_t *n;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
703 int sval;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
704
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
705 // resolve symbols
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
706 // symbols that do not resolve to a constant are left alone
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
707 for (n = s -> head; n; n = n -> next)
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
708 {
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
709 if (n -> term -> term_type == LWASM_TERM_SYM)
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
710 {
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
711 if (sfunc(n -> term -> symbol, state, &sval) == 0)
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
712 {
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
713 n -> term -> term_type = LWASM_TERM_INT;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
714 n -> term -> value = sval;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
715 lwasm_free(n -> term -> symbol);
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
716 n -> term -> symbol = NULL;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
717 }
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
718 }
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
719 }
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
720
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
721 next_iter:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
722 // a single term
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
723 if (s -> head == s -> tail)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
724 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
725
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
726 // search for an operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
727 for (n = s -> head; n; n = n -> next)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
728 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
729 if (n -> term -> term_type == LWASM_TERM_OPER)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
730 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
731 if (n -> term -> value == LWASM_OPER_NEG
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
732 || n -> term -> value == LWASM_OPER_COM
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
733 )
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
734 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
735 // unary operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
736 if (n -> prev && n -> prev -> term -> term_type == LWASM_TERM_INT)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
737 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
738 // a unary operator we can resolve
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
739 // we do the op then remove the term "n" is pointing at
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
740 if (n -> term -> value == LWASM_OPER_NEG)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
741 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
742 n -> prev -> term -> value = -(n -> prev -> term -> value);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
743 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
744 else if (n -> term -> value == LWASM_OPER_COM)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
745 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
746 n -> prev -> term -> value = ~(n -> prev -> term -> value);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
747 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
748 n -> prev -> next = n -> next;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
749 if (n -> next)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
750 n -> next -> prev = n -> prev;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
751 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
752 s -> tail = n -> prev;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
753
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
754 lwasm_expr_term_free(n -> term);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
755 lwasm_free(n);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
756 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
757 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
758 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
759 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
760 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
761 // binary operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
762 if (n -> prev && n -> prev -> prev && n -> prev -> term -> term_type == LWASM_TERM_INT && n -> prev -> prev -> term -> term_type == LWASM_TERM_INT)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
763 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
764 // a binary operator we can resolve
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
765 switch (n -> term -> value)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
766 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
767 case LWASM_OPER_PLUS:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
768 n -> prev -> prev -> term -> value += n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
769 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
770
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
771 case LWASM_OPER_MINUS:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
772 n -> prev -> prev -> term -> value -= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
773 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
774
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
775 case LWASM_OPER_TIMES:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
776 n -> prev -> prev -> term -> value *= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
777 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
778
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
779 case LWASM_OPER_DIVIDE:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
780 if (n -> prev -> term -> value == 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
781 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
782 n -> prev -> prev -> term -> value /= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
783 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
784
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
785 case LWASM_OPER_MOD:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
786 if (n -> prev -> term -> value == 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
787 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
788 n -> prev -> prev -> term -> value %= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
789 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
790
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
791 case LWASM_OPER_INTDIV:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
792 if (n -> prev -> term -> value == 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
793 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
794 n -> prev -> prev -> term -> value /= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
795 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
796
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
797 case LWASM_OPER_BWAND:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
798 n -> prev -> prev -> term -> value &= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
799 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
800
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
801 case LWASM_OPER_BWOR:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
802 n -> prev -> prev -> term -> value |= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
803 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
804
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
805 case LWASM_OPER_BWXOR:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
806 n -> prev -> prev -> term -> value ^= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
807 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
808
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
809 case LWASM_OPER_AND:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
810 n -> prev -> prev -> term -> value = (n -> prev -> term -> value && n -> prev -> prev -> term -> value) ? 1 : 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
811 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
812
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
813 case LWASM_OPER_OR:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
814 n -> prev -> prev -> term -> value = (n -> prev -> term -> value || n -> prev -> prev -> term -> value) ? 1 : 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
815 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
816
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
817 default:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
818 // return error if unknown operator!
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
819 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
820 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
821
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
822 // now remove the two unneeded entries from the stack
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
823 n -> prev -> prev -> next = n -> next;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
824 if (n -> next)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
825 n -> next -> prev = n -> prev -> prev;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
826 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
827 s -> tail = n -> prev -> prev;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
828
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
829 lwasm_expr_term_free(n -> term);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
830 lwasm_expr_term_free(n -> prev -> term);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
831 lwasm_free(n -> prev);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
832 lwasm_free(n);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
833 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
834 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
835 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
836 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
837 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
838 // note for the terminally confused about dynamic memory and pointers:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
839 // n will not be NULL even after the lwasm_free calls above so
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
840 // this test will still work (n will be a dangling pointer)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
841 // (n will only be NULL if we didn't find any operators to simplify)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
842 if (n)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
843 goto next_iter;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
844
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
845 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
846 }