annotate src/expr.c @ 37:538e15927776

Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
author lost
date Sat, 03 Jan 2009 04:20:49 +0000
parents ec0bf61a5502
children efa19ec69df9
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>
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
28 #include <stdio.h>
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
29 #include <stdlib.h>
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
30 #include <string.h>
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
31
14
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
32 #include "expr.h"
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
33 #include "util.h"
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
34
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
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
71 fprintf(stderr, "Creating operator term: %d\n", 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;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
82 fprintf(stderr, "Creating integer term: %d\n", 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
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
94 fprintf(stderr, "Creating symbol term: %s\n", sym);
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
95 t = lwasm_alloc(sizeof(lwasm_expr_term_t));
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
96 t -> term_type = LWASM_TERM_SYM;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
97 t -> symbol = lwasm_strdup(sym);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
98 return t;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
99 }
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
100
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
101 lwasm_expr_term_t *lwasm_expr_term_dup(lwasm_expr_term_t *t)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
102 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
103 switch (t -> term_type)
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
104 {
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
105 case LWASM_TERM_INT:
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
106 return lwasm_expr_term_create_int(t -> value);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
107
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
108 case LWASM_TERM_OPER:
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
109 return lwasm_expr_term_create_oper(t -> value);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
110
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
111 case LWASM_TERM_SYM:
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
112 return lwasm_expr_term_create_sym(t -> symbol);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
113
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
114 default:
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
115 fprintf(stderr, "lwasm_expr_term_dup(): invalid term type %d\n", t -> term_type);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
116 exit(1);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
117 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
118 // can't get here
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
119 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
120
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
121 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
122 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
123 lwasm_expr_stack_node_t *n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
124
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
125 if (!s)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
126 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
127 fprintf(stderr, "lwasm_expr_stack_push(): invalid stack pointer\n");
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
128 exit(1);
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
129 }
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
130
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
131 n = lwasm_alloc(sizeof(lwasm_expr_stack_node_t));
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
132 n -> next = NULL;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
133 n -> prev = s -> tail;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
134 n -> term = lwasm_expr_term_dup(t);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
135
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
136 if (s -> head)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
137 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
138 s -> tail -> next = n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
139 s -> tail = n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
140 }
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
141 else
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
142 {
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
143 s -> head = n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
144 s -> tail = n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
145 }
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 lwasm_expr_term_t *lwasm_expr_stack_pop(lwasm_expr_stack_t *s)
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
149 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
150 lwasm_expr_term_t *t;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
151 lwasm_expr_stack_node_t *n;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
152
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
153 if (!(s -> tail))
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
154 return NULL;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
155
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
156 n = s -> tail;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
157 s -> tail = n -> prev;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
158 if (!(n -> prev))
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
159 {
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
160 s -> head = NULL;
15
1f598d89b9b0 Started creating expression parser
lost
parents: 14
diff changeset
161 }
14
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
162
17
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
163 t = n -> term;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
164 n -> term = NULL;
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
165
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
166 lwasm_free(n);
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
167
df0c4a46af8f Started adding expression handling infrastructure
lost
parents: 15
diff changeset
168 return t;
14
b28d7cb60779 checkpoint
lost
parents: 13
diff changeset
169 }
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
170
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
171 // the following two functions are co-routines which actually parse
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
172 // an infix expression onto the expression stack, each returns -1
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
173 // if an error is encountered
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
174
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 parse a term and push it onto the stack
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
177
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
178 this function handles unary prefix operators (-, +, .not., .com.)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
179 as well as ()
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
180 */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
181 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
182 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
183 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
184 fprintf(stderr, "Expression string %s\n", *p);
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
185 eval_next:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
186 if (**p == '(')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
187 {
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
188 fprintf(stderr, "Starting paren\n");
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
189 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
190 lwasm_expr_parse_expr(s, p, 0);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
191 if (**p != ')')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
192 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
193 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
194 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
195 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
196
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
197 if (**p == '+')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
198 {
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
199 fprintf(stderr, "Unary +\n");
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
200 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
201 goto eval_next;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
202 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
203
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
204 if (**p == '-')
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 // parse expression following "-"
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
207 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
208 if (lwasm_expr_parse_expr(s, p, 200) < 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
209 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
210 t = lwasm_expr_term_create_oper(LWASM_OPER_NEG);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
211 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
212 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
213 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
214 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
215
23
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
216 if (**p == '^')
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
217 {
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
218 // parse expression following "^"
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
219 (*p)++;
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
220 if (lwasm_expr_parse_expr(s, p, 200) < 0)
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
221 return -1;
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
222 t = lwasm_expr_term_create_oper(LWASM_OPER_COM);
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
223 lwasm_expr_stack_push(s, t);
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
224 lwasm_expr_term_free(t);
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
225 return 0;
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
226 }
ec0bf61a5502 Added ^ (bitwise complement)
lost
parents: 18
diff changeset
227
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
228 /*
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
229 we have an actual term here so evaluate it
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 it could be one of the following:
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 1. a decimal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
234 2. a hexadecimal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
235 3. an octal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
236 4. a binary constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
237 5. a symbol reference
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
238 6. the "current" instruction address (*)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
239 7. the "current" data address (.)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
240 8. a "back reference" (<)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
241 9. a "forward reference" (>)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
242
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
243 items 6 through 9 are stored as symbol references
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 (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
246 */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
247 if (**p == '*'
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 **p == '.'
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
250 && (*p)[1] != '.'
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
251 && !((*p)[1] >= 'A' && (*p)[1] <= 'Z')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
252 && !((*p)[1] >= 'a' && (*p)[1] <= 'z')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
253 && !((*p)[1] >= '0' && (*p)[1] <= '9')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
254 )
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
255 || **p == '<'
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
256 || **p == '>')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
257 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
258 char tstr[2];
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
259 tstr[0] = **p;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
260 tstr[1] = '\0';
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
261 t = lwasm_expr_term_create_sym(tstr);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
262 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
263 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
264 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
265 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
266 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
267
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 - a symbol will be a string of characters introduced by a letter, ".",
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
270 "_" but NOT a number
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
271 - a decimal constant will consist of only digits, optionally prefixed
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
272 with "&"
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
273 - 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
274 or suffixed with "B"
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
275 - 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
276 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
277 with $ or start with 0 and end with H
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
278 - an octal constant will consist of 0-7 either prefixed with @ or
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
279 suffixed with "O" or "Q"
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
280 - an ascii constant will be a single character prefixed with a '
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
281 - a double ascii constant will be two characters prefixed with a "
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
282
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
283 */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
284 if (**p == '"')
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 // double ascii constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
287 int val;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
288 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
289 if (!**p)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
290 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
291 if (!*((*p)+1))
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 val = **p << 8 | *((*p) + 1);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
294 (*p) += 2;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
295 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
296 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
297 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
298 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
299 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
300 else if (**p == '\'')
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 // single ascii constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
303 int val;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
304 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
305 if (!**p)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
306 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
307 val = **p;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
308 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
309 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
310 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
311 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
312 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
313 else if (**p == '&')
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 // decimal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
316 int val = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
317
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
318 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
319 while (strchr("0123456789", **p))
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
320 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
321 val = val * 10 + (**p - '0');
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
322 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
323 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
324 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
325 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
326 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
327 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
328 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
329 else if (**p == '%')
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 // binary constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
332 int val = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
333
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
334 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
335 while (**p == '0' || **p == '1')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
336 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
337 val = val * 2 + (**p - '0');
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
338 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
339 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
340 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
341 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
342 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
343 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
344 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
345 else if (**p == '$')
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 // hexadecimal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
348 int val = 0, val2;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
349
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
350 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
351 while (strchr("0123456789ABCDEFabcdef", **p))
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
352 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
353 val2 = toupper(**p) - '0';
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
354 if (val2 > 9)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
355 val2 -= 7;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
356 val = val * 16 + val2;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
357 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
358 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
359 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
360 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
361 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
362 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
363 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
364 else if (**p == '@')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
365 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
366 // octal constant
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
367 int val = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
368
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
369 (*p)++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
370 while (strchr("01234567", **p))
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
371 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
372 val = val * 8 + (**p - '0');
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 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
375 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
376 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
377 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
378 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
379 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
380
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
381 // symbol or bare decimal or suffix identified constant here
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
382 // all numbers will start with a digit at this point
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
383 if (**p < '0' || **p > '9')
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 int l = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
386 char *sb;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
387
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
388 // evaluate a symbol here
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
389 static const char *symchars = "_.$@\\abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
390 while (strchr(symchars, (*p)[l]))
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
391 l++;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
392
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
393 if (l == 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
394 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
395
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
396 sb = lwasm_alloc(l + 1);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
397 sb[l] = '\0';
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
398 memcpy(sb, *p, l);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
399 t = lwasm_expr_term_create_sym(sb);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
400 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
401 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
402 lwasm_free(sb);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
403 (*p) += l;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
404 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
405 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
406
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
407 if (!**p)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
408 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
409
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
410 // evaluate a suffix based constant
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 int decval = 0, binval = 0, hexval = 0, octval = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
413 int valtype = 15; // 1 = bin, 2 = oct, 4 = dec, 8 = hex
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
414 int bindone = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
415 int val;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
416 int dval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
417
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
418 while (1)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
419 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
420 if (!**p || !strchr("0123456789ABCDEFabcdefqhoQHO", **p))
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
421 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
422 // we can legally have bin or decimal here
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
423 if (bindone)
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 // we just finished a binary value
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
426 val = binval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
427 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
428 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
429 else if (valtype & 4)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
430 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
431 // otherwise we must be decimal (if we're still allowed one)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
432 val = decval;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
433 fprintf(stderr, "End of decimal value\n");
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
434 break;
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 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
437 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
438 // bad value
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
439 return -1;
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 }
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 dval = toupper(**p);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
444 (*p)++;
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 if (bindone)
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 // any characters past "B" means it is not binary
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
449 bindone = 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
450 valtype &= 14;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
451 }
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 switch (dval)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
454 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
455 case 'Q':
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
456 case 'O':
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
457 if (valtype & 2)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
458 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
459 val = octval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
460 valtype = -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
461 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
462 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
463 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
464 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
465 // not a valid octal value
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
466 return -1;
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 /* can't get here */
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 case 'H':
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
471 if (valtype & 8)
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 val = hexval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
474 valtype = -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
475 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
476 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
477 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
478 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
479 // not a valid hex number
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
480 return -1;
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 /* can't get here */
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 case 'B':
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
485 // 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
486 // 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
487 // so we fall through to the digit case
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 if (valtype & 1)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
490 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
491 // could still be binary
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
492 bindone = 1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
493 valtype = 9; // hex and binary
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
494 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
495 /* fall through intentional */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
496
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
497 default:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
498 // digit
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
499 dval -= '0';
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
500 if (dval > 9)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
501 dval -= 7;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
502 fprintf(stderr, "Got digit: %d\n", dval);
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
503 // if (dval > 1)
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
504 // valtype &= 14;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
505 // if (dval > 7)
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
506 // valtype &= 12;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
507 // if (dval > 9)
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
508 // valtype &= 8;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
509
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
510 if (valtype & 8)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
511 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
512 hexval = hexval * 16 + dval;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
513 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
514 if (valtype & 4)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
515 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
516 if (dval > 9)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
517 valtype &= 11;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
518 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
519 decval = decval * 10 + dval;
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 (valtype & 2)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
522 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
523 if (dval > 7)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
524 valtype &= 13;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
525 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
526 octval = octval * 8 + dval;
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 (valtype & 1)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
529 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
530 if (dval > 1)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
531 valtype &= 14;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
532 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
533 binval = binval * 2 + dval;
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 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
536 // 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
537 if (valtype == -1)
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
538 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
539 // return if no more valid possibilities!
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
540 if (valtype == 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
541 return -1;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
542 val = decval; // in case we fall through
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
543 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
544
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
545 // we get here when we have a value to return
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
546 t = lwasm_expr_term_create_int(val);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
547 lwasm_expr_stack_push(s, t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
548 lwasm_expr_term_free(t);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
549 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
550 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
551 /* can't get here */
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
552 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
553
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
554 // parse an expression and push the result onto the stack
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
555 // 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
556 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
557 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
558 static const struct operinfo
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
559 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
560 int opernum;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
561 char *operstr;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
562 int operprec;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
563 } operators[] =
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 { LWASM_OPER_PLUS, "+", 100 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
566 { LWASM_OPER_MINUS, "-", 100 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
567 { LWASM_OPER_TIMES, "*", 150 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
568 { LWASM_OPER_DIVIDE, "/", 150 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
569 { LWASM_OPER_MOD, "%", 150 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
570 { LWASM_OPER_INTDIV, "\\", 150 },
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
571
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
572 { LWASM_OPER_NONE, "", 0 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
573 };
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
574 int opern, i;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
575 lwasm_expr_term_t *operterm;
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 // 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
578 if (!**p || isspace(**p) || **p == ')' || **p == ',')
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
579 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
580
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
581 if (lwasm_expr_parse_term(s, p) < 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
582 return -1;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
583
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
584 eval_next:
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
585 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
586 return 0;
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
587
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
588 // expecting an operator here
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
589 for (opern = 0; operators[opern].opernum != LWASM_OPER_NONE; opern++)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
590 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
591 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
592 /* do nothing */ ;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
593 if (operators[opern].operstr[i] == '\0')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
594 break;
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 if (operators[opern].opernum == LWASM_OPER_NONE)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
597 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
598 // unrecognized operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
599 return -1;
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
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
602 // 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
603 // operator string
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
604
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
605 // logic:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
606 // if the precedence of this operation is <= to the "prec" flag,
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
607 // we simply return without advancing the input pointer; the operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
608 // will be evaluated again in the enclosing function call
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
609 if (operators[opern].operprec <= prec)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
610 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
611
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
612 // logic:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
613 // we have a higher precedence operator here so we will advance the
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
614 // input pointer to the next term and let the expression evaluator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
615 // 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
616 // stack and then go on with the expression evaluation
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
617 (*p) += i; // advance input pointer
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
618
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
619 // evaluate next expression(s) of higher precedence
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
620 if (lwasm_expr_parse_expr(s, p, operators[opern].operprec) < 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
621 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
622
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
623 operterm = lwasm_expr_term_create_oper(operators[opern].opernum);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
624 lwasm_expr_stack_push(s, operterm);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
625 lwasm_expr_term_free(operterm);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
626
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
627 // 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
628 if (!**p || isspace(**p) || **p == ')')
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
629 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
630
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
631 // continue evaluating
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
632 goto eval_next;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
633 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
634
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 actually evaluate an expression
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
637
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
638 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
639 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
640 result is returned.
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
641
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
642 Returns NULL on a parse error or otherwise invalid expression. *outp will
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
643 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
644 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
645 */
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
646 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
647 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
648 lwasm_expr_stack_t *s;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
649 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
650 int rval;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
651
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
652 // actually parse the expression
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
653 p = inp;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
654 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
655
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
656 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
657 if (rval < 0)
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
658 goto cleanup_error;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
659
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
660 // save end of expression
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
661 if (outp)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
662 (*outp) = p;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
663
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
664 // 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
665 if (lwasm_expr_reval(s, sfunc, state) < 0)
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
666 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
667
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
668 if (lwasm_expr_is_constant(s))
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
669 fprintf(stderr, "Constant expression evaluates to: %d\n", lwasm_expr_get_value(s));
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
670
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
671 return s;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
672
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
673 cleanup_error:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
674 lwasm_expr_stack_free(s);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
675 return NULL;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
676 }
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 /*
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
679 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
680
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
681 return -1 on error, 0 on no error
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 possible errors are: division by zero or unknown operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
684
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
685 theory of operation:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
686
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
687 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
688 or 1 constant preceding it (unary) and if found, perform the calculation
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
689 and replace the operator and its operands with the result
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
690
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
691 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
692 further operators or only a single term remains
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
693
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
694 */
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
695 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
696 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
697 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
698 int sval;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
699
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
700 // resolve symbols
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
701 // 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
702 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
703 {
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
704 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
705 {
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
706 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
707 {
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
708 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
709 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
710 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
711 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
712 }
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
713 }
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 23
diff changeset
714 }
18
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
715
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
716 next_iter:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
717 // a single term
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
718 if (s -> head == s -> tail)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
719 return 0;
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 // search for an operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
722 for (n = s -> head; n; n = n -> next)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
723 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
724 if (n -> term -> term_type == LWASM_TERM_OPER)
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 if (n -> term -> value == LWASM_OPER_NEG
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
727 || n -> term -> value == LWASM_OPER_COM
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 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
730 // unary operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
731 if (n -> prev && n -> prev -> term -> term_type == LWASM_TERM_INT)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
732 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
733 // a unary operator we can resolve
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
734 // we do the op then remove the term "n" is pointing at
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
735 if (n -> term -> value == LWASM_OPER_NEG)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
736 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
737 n -> prev -> term -> value = -(n -> prev -> term -> value);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
738 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
739 else if (n -> term -> value == LWASM_OPER_COM)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
740 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
741 n -> prev -> term -> value = ~(n -> prev -> term -> value);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
742 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
743 n -> prev -> next = n -> next;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
744 if (n -> next)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
745 n -> next -> prev = n -> prev;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
746 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
747 s -> tail = n -> prev;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
748
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
749 lwasm_expr_term_free(n -> term);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
750 lwasm_free(n);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
751 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
752 }
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 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
755 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
756 // binary operator
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
757 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
758 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
759 // a binary operator we can resolve
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
760 switch (n -> term -> value)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
761 {
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
762 case LWASM_OPER_PLUS:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
763 n -> prev -> prev -> term -> value += n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
764 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
765
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
766 case LWASM_OPER_MINUS:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
767 n -> prev -> prev -> term -> value -= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
768 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
769
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
770 case LWASM_OPER_TIMES:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
771 n -> prev -> prev -> term -> value *= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
772 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
773
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
774 case LWASM_OPER_DIVIDE:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
775 if (n -> prev -> term -> value == 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
776 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
777 n -> prev -> prev -> term -> value /= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
778 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
779
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
780 case LWASM_OPER_MOD:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
781 if (n -> prev -> term -> value == 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
782 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
783 n -> prev -> prev -> term -> value %= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
784 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
785
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
786 case LWASM_OPER_INTDIV:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
787 if (n -> prev -> term -> value == 0)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
788 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
789 n -> prev -> prev -> term -> value /= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
790 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
791
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
792 case LWASM_OPER_BWAND:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
793 n -> prev -> prev -> term -> value &= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
794 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
795
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
796 case LWASM_OPER_BWOR:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
797 n -> prev -> prev -> term -> value |= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
798 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
799
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
800 case LWASM_OPER_BWXOR:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
801 n -> prev -> prev -> term -> value ^= n -> prev -> term -> value;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
802 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
803
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
804 case LWASM_OPER_AND:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
805 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
806 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
807
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
808 case LWASM_OPER_OR:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
809 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
810 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
811
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
812 default:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
813 // return error if unknown operator!
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
814 return -1;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
815 }
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 // now remove the two unneeded entries from the stack
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
818 n -> prev -> prev -> next = n -> next;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
819 if (n -> next)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
820 n -> next -> prev = n -> prev -> prev;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
821 else
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
822 s -> tail = n -> prev -> prev;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
823
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
824 lwasm_expr_term_free(n -> term);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
825 lwasm_expr_term_free(n -> prev -> term);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
826 lwasm_free(n -> prev);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
827 lwasm_free(n);
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
828 break;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
829 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
830 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
831 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
832 }
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
833 // note for the terminally confused about dynamic memory and pointers:
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
834 // 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
835 // this test will still work (n will be a dangling pointer)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
836 // (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
837 if (n)
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
838 goto next_iter;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
839
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
840 return 0;
218aabbc3b1a First pass at expression evaluator complete
lost
parents: 17
diff changeset
841 }